66 RESOURCES_DIR ,
77 AndroidBuildDefaults ,
88 PLUGIN_BUILD_DATA_FILENAME ,
9- PlatformTypes ,
9+ SCOPED_ANDROID_RUNTIME_NAME ,
1010} from "../constants" ;
1111import { getShortPluginName , hook } from "../common/helpers" ;
1212import { Builder , parseString } from "xml2js" ;
@@ -16,7 +16,6 @@ import {
1616 IAndroidToolsInfo ,
1717 IWatchIgnoreListService ,
1818} from "../declarations" ;
19- import { IBasePluginData } from "../definitions/plugins" ;
2019import { IPlatformsDataService } from "../definitions/platform" ;
2120import { IProjectDataService } from "../definitions/project" ;
2221import {
@@ -440,16 +439,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
440439 }
441440
442441 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 ( ) ;
450443 runtimeGradleVersions = await this . getGradleVersions (
451- latestRuntimeVersion ,
452- runtimePackage
444+ latestRuntimeVersion
453445 ) ;
454446 this . $logger . trace (
455447 `Got gradle versions ${ JSON . stringify (
@@ -461,22 +453,23 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
461453 return runtimeGradleVersions || { } ;
462454 }
463455
464- private async getLatestRuntimeVersion (
465- runtimePackage : IBasePluginData
466- ) : Promise < string > {
456+ private async getLatestRuntimeVersion ( ) : Promise < string > {
467457 let runtimeVersion : string = null ;
468458
469459 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+ ) ;
473466 runtimeVersion = result . latest ;
474467 } catch ( err ) {
475468 this . $logger . trace (
476469 `Error while getting latest android runtime version from view command: ${ err } `
477470 ) ;
478471 const registryData = await this . $packageManager . getRegistryPackageData (
479- runtimePackage . name
472+ SCOPED_ANDROID_RUNTIME_NAME
480473 ) ;
481474 runtimeVersion = registryData [ "dist-tags" ] . latest ;
482475 }
@@ -485,16 +478,15 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
485478 }
486479
487480 private async getGradleVersions (
488- runtimeVersion : string ,
489- runtimePackage : IBasePluginData
481+ runtimeVersion : string
490482 ) : Promise < IRuntimeGradleVersions > {
491483 let runtimeGradleVersions : {
492484 gradle : { version : string ; android : string } ;
493485 } = null ;
494486
495487 try {
496488 const output = await this . $packageManager . view (
497- `${ runtimePackage . name } @${ runtimeVersion } ` ,
489+ `${ SCOPED_ANDROID_RUNTIME_NAME } @${ runtimeVersion } ` ,
498490 { gradle : true }
499491 ) ;
500492 runtimeGradleVersions = { gradle : output } ;
@@ -503,7 +495,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
503495 `Error while getting gradle data for android runtime from view command: ${ err } `
504496 ) ;
505497 const registryData = await this . $packageManager . getRegistryPackageData (
506- runtimePackage . name
498+ SCOPED_ANDROID_RUNTIME_NAME
507499 ) ;
508500 runtimeGradleVersions = registryData . versions [ runtimeVersion ] ;
509501 }
0 commit comments