File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed
Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ export class PackageInstallationManager implements IPackageInstallationManager {
7070 versions : true ,
7171 } ) ;
7272
73- return semver . maxSatisfying ( data , versionRange ) ;
73+ return semver . maxSatisfying ( data . versions || data , versionRange ) ;
7474 }
7575
7676 public async getMaxSatisfyingVersionSafe (
@@ -320,9 +320,10 @@ export class PackageInstallationManager implements IPackageInstallationManager {
320320 packageName : string ,
321321 version : string
322322 ) : Promise < string > {
323- const data : any = await this . $packageManager . view ( packageName , {
323+ let data : any = await this . $packageManager . view ( packageName , {
324324 "dist-tags" : true ,
325325 } ) ;
326+ data = data [ 'dist-tags' ] || data ;
326327 this . $logger . trace ( "Using version %s. " , data [ version ] ) ;
327328
328329 return data [ version ] ;
Original file line number Diff line number Diff line change @@ -430,12 +430,13 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
430430 let runtimeVersion : string = null ;
431431
432432 try {
433- const result = await this . $packageManager . view (
433+ let result = await this . $packageManager . view (
434434 SCOPED_ANDROID_RUNTIME_NAME ,
435435 {
436436 "dist-tags" : true ,
437437 }
438438 ) ;
439+ result = result [ 'dist-tags' ] || result ;
439440 runtimeVersion = result . latest ;
440441 } catch ( err ) {
441442 this . $logger . trace (
@@ -529,6 +530,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
529530 `${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
530531 { version_info : true }
531532 ) ;
533+ output = output [ 'version_info' ] || output ;
532534
533535 if ( ! output ) {
534536 /**
@@ -543,6 +545,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
543545 `${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
544546 { gradle : true }
545547 ) ;
548+ output = output [ 'gradle' ] || output ;
546549
547550 const { version, android } = output ;
548551
You can’t perform that action at this time.
0 commit comments