@@ -14,7 +14,9 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
14
14
private showWarningsAsErrors : boolean ;
15
15
private toolsInfo : IAndroidToolsInfoData ;
16
16
private selectedCompileSdk : number ;
17
- private androidHome = process . env [ "ANDROID_HOME" ] ;
17
+ private get androidHome ( ) : string {
18
+ return process . env [ "ANDROID_HOME" ] ;
19
+ }
18
20
19
21
constructor ( private $childProcess : IChildProcess ,
20
22
private $errors : IErrors ,
@@ -29,7 +31,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
29
31
if ( ! this . toolsInfo ) {
30
32
let infoData : IAndroidToolsInfoData = Object . create ( null ) ;
31
33
infoData . androidHomeEnvVar = this . androidHome ;
32
- infoData . compileSdkVersion = this . getCompileSdk ( ) ;
34
+ infoData . compileSdkVersion = this . getCompileSdkVersion ( ) ;
33
35
infoData . buildToolsVersion = this . getBuildToolsVersion ( ) ;
34
36
infoData . targetSdkVersion = this . getTargetSdk ( ) ;
35
37
infoData . supportRepositoryVersion = this . getAndroidSupportRepositoryVersion ( ) ;
@@ -163,17 +165,17 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
163
165
164
166
@cache ( )
165
167
private getPathToSdkManagementTool ( ) : string {
166
- const sdkmanagerName = "sdkmanager" ;
167
- let sdkManagementToolPath = sdkmanagerName ;
168
+ const sdkManagerName = "sdkmanager" ;
169
+ let sdkManagementToolPath = sdkManagerName ;
168
170
169
171
const isAndroidHomeValid = this . validateAndroidHomeEnvVariable ( ) ;
170
172
171
173
if ( isAndroidHomeValid ) {
172
174
// In case ANDROID_HOME is correct, check if sdkmanager exists and if not it means the SDK has not been updated.
173
175
// In this case user shoud use `android` from the command-line instead of sdkmanager.
174
- const pathToSdkmanager = path . join ( this . androidHome , "tools" , "bin" , sdkmanagerName ) ;
176
+ const pathToSdkManager = path . join ( this . androidHome , "tools" , "bin" , sdkManagerName ) ;
175
177
const pathToAndroidExecutable = path . join ( this . androidHome , "tools" , "android" ) ;
176
- const pathToExecutable = this . $fs . exists ( pathToSdkmanager ) ? pathToSdkmanager : pathToAndroidExecutable ;
178
+ const pathToExecutable = this . $fs . exists ( pathToSdkManager ) ? pathToSdkManager : pathToAndroidExecutable ;
177
179
178
180
this . $logger . trace ( `Path to Android SDK Management tool is: ${ pathToExecutable } ` ) ;
179
181
@@ -208,7 +210,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
208
210
}
209
211
}
210
212
211
- private getCompileSdk ( ) : number {
213
+ private getCompileSdkVersion ( ) : number {
212
214
if ( ! this . selectedCompileSdk ) {
213
215
let userSpecifiedCompileSdk = this . $options . compileSdk ;
214
216
if ( userSpecifiedCompileSdk ) {
@@ -235,7 +237,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
235
237
}
236
238
237
239
private getTargetSdk ( ) : number {
238
- let targetSdk = this . $options . sdk ? parseInt ( this . $options . sdk ) : this . getCompileSdk ( ) ;
240
+ let targetSdk = this . $options . sdk ? parseInt ( this . $options . sdk ) : this . getCompileSdkVersion ( ) ;
239
241
this . $logger . trace ( `Selected targetSdk is: ${ targetSdk } ` ) ;
240
242
return targetSdk ;
241
243
}
@@ -282,7 +284,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
282
284
}
283
285
284
286
private getAppCompatRange ( ) : string {
285
- let compileSdkVersion = this . getCompileSdk ( ) ;
287
+ let compileSdkVersion = this . getCompileSdkVersion ( ) ;
286
288
let requiredAppCompatRange : string ;
287
289
if ( compileSdkVersion ) {
288
290
requiredAppCompatRange = `>=${ compileSdkVersion } <${ compileSdkVersion + 1 } ` ;
0 commit comments