6
6
RESOURCES_DIR ,
7
7
AndroidBuildDefaults ,
8
8
PLUGIN_BUILD_DATA_FILENAME ,
9
- PlatformTypes ,
9
+ SCOPED_ANDROID_RUNTIME_NAME ,
10
10
} from "../constants" ;
11
11
import { getShortPluginName , hook } from "../common/helpers" ;
12
12
import { Builder , parseString } from "xml2js" ;
@@ -16,7 +16,6 @@ import {
16
16
IAndroidToolsInfo ,
17
17
IWatchIgnoreListService ,
18
18
} from "../declarations" ;
19
- import { IBasePluginData } from "../definitions/plugins" ;
20
19
import { IPlatformsDataService } from "../definitions/platform" ;
21
20
import { IProjectDataService } from "../definitions/project" ;
22
21
import {
@@ -440,16 +439,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
440
439
}
441
440
442
441
if ( ! runtimeGradleVersions ) {
443
- const runtimePackage = this . $projectDataService . getRuntimePackage (
444
- projectDir ,
445
- PlatformTypes . android
446
- ) ;
447
- const latestRuntimeVersion = await this . getLatestRuntimeVersion (
448
- runtimePackage
449
- ) ;
442
+ const latestRuntimeVersion = await this . getLatestRuntimeVersion ( ) ;
450
443
runtimeGradleVersions = await this . getGradleVersions (
451
- latestRuntimeVersion ,
452
- runtimePackage
444
+ latestRuntimeVersion
453
445
) ;
454
446
this . $logger . trace (
455
447
`Got gradle versions ${ JSON . stringify (
@@ -461,22 +453,23 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
461
453
return runtimeGradleVersions || { } ;
462
454
}
463
455
464
- private async getLatestRuntimeVersion (
465
- runtimePackage : IBasePluginData
466
- ) : Promise < string > {
456
+ private async getLatestRuntimeVersion ( ) : Promise < string > {
467
457
let runtimeVersion : string = null ;
468
458
469
459
try {
470
- const result = await this . $packageManager . view ( runtimePackage . name , {
471
- "dist-tags" : true ,
472
- } ) ;
460
+ const result = await this . $packageManager . view (
461
+ SCOPED_ANDROID_RUNTIME_NAME ,
462
+ {
463
+ "dist-tags" : true ,
464
+ }
465
+ ) ;
473
466
runtimeVersion = result . latest ;
474
467
} catch ( err ) {
475
468
this . $logger . trace (
476
469
`Error while getting latest android runtime version from view command: ${ err } `
477
470
) ;
478
471
const registryData = await this . $packageManager . getRegistryPackageData (
479
- runtimePackage . name
472
+ SCOPED_ANDROID_RUNTIME_NAME
480
473
) ;
481
474
runtimeVersion = registryData [ "dist-tags" ] . latest ;
482
475
}
@@ -485,16 +478,15 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
485
478
}
486
479
487
480
private async getGradleVersions (
488
- runtimeVersion : string ,
489
- runtimePackage : IBasePluginData
481
+ runtimeVersion : string
490
482
) : Promise < IRuntimeGradleVersions > {
491
483
let runtimeGradleVersions : {
492
484
gradle : { version : string ; android : string } ;
493
485
} = null ;
494
486
495
487
try {
496
488
const output = await this . $packageManager . view (
497
- `${ runtimePackage . name } @${ runtimeVersion } ` ,
489
+ `${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
498
490
{ gradle : true }
499
491
) ;
500
492
runtimeGradleVersions = { gradle : output } ;
@@ -503,7 +495,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
503
495
`Error while getting gradle data for android runtime from view command: ${ err } `
504
496
) ;
505
497
const registryData = await this . $packageManager . getRegistryPackageData (
506
- runtimePackage . name
498
+ SCOPED_ANDROID_RUNTIME_NAME
507
499
) ;
508
500
runtimeGradleVersions = registryData . versions [ runtimeVersion ] ;
509
501
}
0 commit comments