@@ -10,7 +10,7 @@ import * as _ from "lodash";
1010
1111export class AndroidToolsInfo implements NativeScriptDoctor . IAndroidToolsInfo {
1212 public readonly ANDROID_TARGET_PREFIX = "android" ;
13- public readonly SUPPORTED_TARGETS = [
13+ private static SUPPORTED_TARGETS = [
1414 "android-17" ,
1515 "android-18" ,
1616 "android-19" ,
@@ -24,9 +24,9 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
2424 "android-28" ,
2525 "android-29"
2626 ] ;
27- public readonly MIN_REQUIRED_COMPILE_TARGET = 28 ;
28- public readonly REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=23" ;
29- public readonly VERSION_REGEX = / ( ( \d + \. ) { 2 } \d + ) / ;
27+ private static MIN_REQUIRED_COMPILE_TARGET = 28 ;
28+ private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=23" ;
29+ private static VERSION_REGEX = / ( ( \d + \. ) { 2 } \d + ) / ;
3030 private static MIN_JAVA_VERSION = "1.8.0" ;
3131
3232 private toolsInfo : NativeScriptDoctor . IAndroidToolsInfoData ;
@@ -60,7 +60,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
6060 const isAndroidHomeValid = this . isAndroidHomeValid ( ) ;
6161 if ( ! toolsInfoData . compileSdkVersion ) {
6262 errors . push ( {
63- warning : `Cannot find a compatible Android SDK for compilation. To be able to build for Android, install Android SDK ${ this . MIN_REQUIRED_COMPILE_TARGET } or later.` ,
63+ warning : `Cannot find a compatible Android SDK for compilation. To be able to build for Android, install Android SDK ${ AndroidToolsInfo . MIN_REQUIRED_COMPILE_TARGET } or later.` ,
6464 additionalInformation : `Run \`\$ ${ this . getPathToSdkManagementTool ( ) } \` to manage your Android SDK versions.` ,
6565 platforms : [ Constants . ANDROID_PLATFORM_NAME ]
6666 } ) ;
@@ -98,7 +98,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
9898 + "To be able to build for Android, verify that you have installed The Java Development Kit (JDK) and configured it according to system requirements as" + EOL +
9999 " described in " + this . getSystemRequirementsLink ( ) ;
100100
101- const matchingVersion = this . helpers . appendZeroesToVersion ( installedJavaCompilerVersion || "" , 3 ) . match ( this . VERSION_REGEX ) ;
101+ const matchingVersion = this . helpers . appendZeroesToVersion ( installedJavaCompilerVersion || "" , 3 ) . match ( AndroidToolsInfo . VERSION_REGEX ) ;
102102 const installedJavaCompilerSemverVersion = matchingVersion && matchingVersion [ 1 ] ;
103103 if ( installedJavaCompilerSemverVersion ) {
104104 let warning : string = null ;
@@ -187,10 +187,10 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
187187 public validateMinSupportedTargetSdk ( targetSdk : number ) : NativeScriptDoctor . IWarning [ ] {
188188 const errors : NativeScriptDoctor . IWarning [ ] = [ ] ;
189189 const newTarget = `${ this . ANDROID_TARGET_PREFIX } -${ targetSdk } ` ;
190- const targetSupported = _ . includes ( this . SUPPORTED_TARGETS , newTarget ) ;
190+ const targetSupported = _ . includes ( AndroidToolsInfo . SUPPORTED_TARGETS , newTarget ) ;
191191
192- if ( ! _ . includes ( this . SUPPORTED_TARGETS , newTarget ) ) {
193- const supportedVersions = this . SUPPORTED_TARGETS . sort ( ) ;
192+ if ( ! _ . includes ( AndroidToolsInfo . SUPPORTED_TARGETS , newTarget ) ) {
193+ const supportedVersions = AndroidToolsInfo . SUPPORTED_TARGETS . sort ( ) ;
194194 const minSupportedVersion = this . parseAndroidSdkString ( _ . first ( supportedVersions ) ) ;
195195
196196 if ( ! targetSupported && targetSdk && ( targetSdk < minSupportedVersion ) ) {
@@ -208,7 +208,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
208208 public validataMaxSupportedTargetSdk ( targetSdk : number ) : NativeScriptDoctor . IWarning [ ] {
209209 const errors : NativeScriptDoctor . IWarning [ ] = [ ] ;
210210 const newTarget = `${ this . ANDROID_TARGET_PREFIX } -${ targetSdk } ` ;
211- const targetSupported = _ . includes ( this . SUPPORTED_TARGETS , newTarget ) ;
211+ const targetSupported = _ . includes ( AndroidToolsInfo . SUPPORTED_TARGETS , newTarget ) ;
212212
213213 if ( ! targetSupported && ! targetSdk || targetSdk > this . getMaxSupportedVersion ( ) ) {
214214 errors . push ( {
@@ -269,7 +269,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
269269 if ( latestValidAndroidTarget ) {
270270 const integerVersion = this . parseAndroidSdkString ( latestValidAndroidTarget ) ;
271271
272- if ( integerVersion && integerVersion >= this . MIN_REQUIRED_COMPILE_TARGET ) {
272+ if ( integerVersion && integerVersion >= AndroidToolsInfo . MIN_REQUIRED_COMPILE_TARGET ) {
273273 return integerVersion ;
274274 }
275275 }
@@ -282,7 +282,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
282282
283283 const subDirsVersions = subDirs
284284 . map ( dirName => {
285- const dirNameGroups = dirName . match ( this . VERSION_REGEX ) ;
285+ const dirNameGroups = dirName . match ( AndroidToolsInfo . VERSION_REGEX ) ;
286286 if ( dirNameGroups ) {
287287 return dirNameGroups [ 1 ] ;
288288 }
@@ -301,7 +301,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
301301 }
302302
303303 private getBuildToolsRange ( ) : string {
304- return `${ this . REQUIRED_BUILD_TOOLS_RANGE_PREFIX } <=${ this . getMaxSupportedVersion ( ) } ` ;
304+ return `${ AndroidToolsInfo . REQUIRED_BUILD_TOOLS_RANGE_PREFIX } <=${ this . getMaxSupportedVersion ( ) } ` ;
305305 }
306306
307307 private getBuildToolsVersion ( ) : string {
@@ -316,7 +316,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
316316 }
317317
318318 private getLatestValidAndroidTarget ( installedTargets : string [ ] ) : string {
319- return _ . findLast ( this . SUPPORTED_TARGETS . sort ( ) , supportedTarget => _ . includes ( installedTargets , supportedTarget ) ) ;
319+ return _ . findLast ( AndroidToolsInfo . SUPPORTED_TARGETS . sort ( ) , supportedTarget => _ . includes ( installedTargets , supportedTarget ) ) ;
320320 }
321321
322322 private parseAndroidSdkString ( androidSdkString : string ) : number {
@@ -337,7 +337,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
337337 }
338338
339339 private getMaxSupportedVersion ( ) : number {
340- return this . parseAndroidSdkString ( this . SUPPORTED_TARGETS . sort ( ) [ this . SUPPORTED_TARGETS . length - 1 ] ) ;
340+ return this . parseAndroidSdkString ( AndroidToolsInfo . SUPPORTED_TARGETS . sort ( ) [ AndroidToolsInfo . SUPPORTED_TARGETS . length - 1 ] ) ;
341341 }
342342
343343 private getSystemRequirementsLink ( ) : string {
0 commit comments