File tree 2 files changed +7
-3
lines changed 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 @@ -430,12 +430,13 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
430
430
let runtimeVersion : string = null ;
431
431
432
432
try {
433
- const result = await this . $packageManager . view (
433
+ let result = await this . $packageManager . view (
434
434
SCOPED_ANDROID_RUNTIME_NAME ,
435
435
{
436
436
"dist-tags" : true ,
437
437
}
438
438
) ;
439
+ result = result [ 'dist-tags' ] || result ;
439
440
runtimeVersion = result . latest ;
440
441
} catch ( err ) {
441
442
this . $logger . trace (
@@ -529,6 +530,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
529
530
`${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
530
531
{ version_info : true }
531
532
) ;
533
+ output = output [ 'version_info' ] || output ;
532
534
533
535
if ( ! output ) {
534
536
/**
@@ -543,6 +545,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
543
545
`${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
544
546
{ gradle : true }
545
547
) ;
548
+ output = output [ 'gradle' ] || output ;
546
549
547
550
const { version, android } = output ;
548
551
You can’t perform that action at this time.
0 commit comments