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 {
70
70
versions : true ,
71
71
} ) ;
72
72
73
- return semver . maxSatisfying ( data , versionRange ) ;
73
+ return semver . maxSatisfying ( data . versions || data , versionRange ) ;
74
74
}
75
75
76
76
public async getMaxSatisfyingVersionSafe (
@@ -320,9 +320,10 @@ export class PackageInstallationManager implements IPackageInstallationManager {
320
320
packageName : string ,
321
321
version : string
322
322
) : Promise < string > {
323
- const data : any = await this . $packageManager . view ( packageName , {
323
+ let data : any = await this . $packageManager . view ( packageName , {
324
324
"dist-tags" : true ,
325
325
} ) ;
326
+ data = data [ 'dist-tags' ] || data ;
326
327
this . $logger . trace ( "Using version %s. " , data [ version ] ) ;
327
328
328
329
return data [ version ] ;
Original file line number Diff line number Diff line change @@ -469,12 +469,13 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
469
469
let runtimeVersion : string = null ;
470
470
471
471
try {
472
- const result = await this . $packageManager . view (
472
+ let result = await this . $packageManager . view (
473
473
SCOPED_ANDROID_RUNTIME_NAME ,
474
474
{
475
475
"dist-tags" : true ,
476
476
}
477
477
) ;
478
+ result = result [ 'dist-tags' ] || result ;
478
479
runtimeVersion = result . latest ;
479
480
} catch ( err ) {
480
481
this . $logger . trace (
@@ -568,6 +569,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
568
569
`${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
569
570
{ version_info : true }
570
571
) ;
572
+ output = output [ 'version_info' ] || output ;
571
573
572
574
if ( ! output ) {
573
575
/**
@@ -582,6 +584,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
582
584
`${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
583
585
{ gradle : true }
584
586
) ;
587
+ output = output [ 'gradle' ] || output ;
585
588
586
589
const { version, android } = output ;
587
590
You can’t perform that action at this time.
0 commit comments