feat(android): support android-37 SDK targets

Accept minor-versioned SDK platform directories (e.g. android-37.0) for
--compile-sdk, map the android-37 targets to Android 17 for emulator
listing, and update @nativescript/doctor to 2.0.18 which resolves the
compile SDK from such directories.

Ref: NS-261289

Author: edusperoni

lib/android-tools-info.ts

@@ -17,7 +17,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $options: IOptions,
-		protected $staticConfig: Config.IStaticConfig
+		protected $staticConfig: Config.IStaticConfig,
 	) {}
 
 	@cache()
@@ -29,18 +29,18 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		infoData.androidHomeEnvVar = androidToolsInfo.androidHome;
 		infoData.compileSdkVersion = this.getCompileSdkVersion(
 			infoData.installedTargets,
-			infoData.compileSdkVersion
+			infoData.compileSdkVersion,
 		);
 		infoData.targetSdkVersion = this.getTargetSdk(infoData.compileSdkVersion);
 		infoData.generateTypings = this.shouldGenerateTypings();
 
 		this.$logger.trace(
 			"Installed Android Targets are: ",
-			infoData.installedTargets
+			infoData.installedTargets,
 		);
 		this.$logger.trace(
 			"Selected buildToolsVersion is:",
-			infoData.buildToolsVersion
+			infoData.buildToolsVersion,
 		);
 
 		return infoData;
@@ -55,7 +55,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			androidToolsInfo
 				.validateInfo({ projectDir: options.projectDir })
 				.map((warning) =>
-					this.printMessage(warning.warning, showWarningsAsErrors)
+					this.printMessage(warning.warning, showWarningsAsErrors),
 				).length > 0;
 
 		if (options && options.validateTargetSdk) {
@@ -78,7 +78,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 					projectDir: options.projectDir,
 				})
 				.map((warning) =>
-					this.printMessage(warning.warning, options.showWarningsAsErrors)
+					this.printMessage(warning.warning, options.showWarningsAsErrors),
 				).length > 0;
 
 		if (!detectedErrors) {
@@ -95,15 +95,15 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 
 	public validateJavacVersion(
 		installedJavacVersion: string,
-		options?: IAndroidToolsInfoOptions
+		options?: IAndroidToolsInfoOptions,
 	): boolean {
 		const showWarningsAsErrors = options && options.showWarningsAsErrors;
 
 		return (
 			androidToolsInfo
 				.validateJavacVersion(installedJavacVersion)
 				.map((warning) =>
-					this.printMessage(warning.warning, showWarningsAsErrors)
+					this.printMessage(warning.warning, showWarningsAsErrors),
 				).length > 0
 		);
 	}
@@ -118,8 +118,8 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				`Error while executing '${path.join(
 					androidToolsInfo.androidHome,
 					"platform-tools",
-					"adb"
-				)} help'. Error is: ${err.message}`
+					"adb",
+				)} help'. Error is: ${err.message}`,
 			);
 		}
 
@@ -128,15 +128,15 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 
 	@cache()
 	public validateAndroidHomeEnvVariable(
-		options?: IAndroidToolsInfoOptions
+		options?: IAndroidToolsInfoOptions,
 	): boolean {
 		const showWarningsAsErrors = options && options.showWarningsAsErrors;
 
 		return (
 			androidToolsInfo
 				.validateAndroidHomeEnvVariable()
 				.map((warning) =>
-					this.printMessage(warning.warning, showWarningsAsErrors)
+					this.printMessage(warning.warning, showWarningsAsErrors),
 				).length > 0
 		);
 	}
@@ -163,15 +163,30 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 
 	private getCompileSdkVersion(
 		installedTargets: string[],
-		latestCompileSdk: number
+		latestCompileSdk: number,
 	): number {
 		const userSpecifiedCompileSdk = this.$options.compileSdk;
 
 		if (userSpecifiedCompileSdk) {
 			const androidCompileSdk = `${androidToolsInfo.ANDROID_TARGET_PREFIX}-${userSpecifiedCompileSdk}`;
-			if (!_.includes(installedTargets, androidCompileSdk)) {
+			// SDK platforms newer than android-36 may install into directories named
+			// "android-<api>.<minor>" (e.g. "android-37.0") with no plain
+			// "android-<api>" directory, so installed targets are matched on their
+			// API level rather than the exact directory name.
+			const isTargetInstalled = _.some(installedTargets, (target) => {
+				if (target === androidCompileSdk) {
+					return true;
+				}
+
+				const targetMatch = target.match(/^android-(\d+)(?:\.\d+)?$/);
+				return (
+					targetMatch &&
+					parseInt(targetMatch[1], 10) === userSpecifiedCompileSdk
+				);
+			});
+			if (!isTargetInstalled) {
 				this.$errors.fail(
-					`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`
+					`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`,
 				);
 			}
 

lib/common/mobile/emulator-helper.ts

@@ -5,6 +5,9 @@ import { injector } from "../yok";
 export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
+		"android-37": "17.0.0",
+		"android-37.0": "17.0.0",
+		"android-37.1": "17.0.0",
 		"android-36": "16.0.0",
 		"android-36.1": "16.0.0",
 		"android-35": "15.0.0",

package-lock.json

@@ -43,7 +43,7 @@
   ],
   "dependencies": {
     "@foxt/js-srp": "0.0.3-patch2",
-    "@nativescript/doctor": "2.0.17",
+    "@nativescript/doctor": "2.0.18",
     "@nativescript/hook": "3.0.5",
     "@npmcli/arborist": "9.1.8",
     "@rigor789/resolve-package-path": "1.0.7",

package.json

@@ -39,18 +39,54 @@ describe("androidToolsInfo", () => {
 		return testInjector;
 	};
 
+	describe("getCompileSdkVersion", () => {
+		const resolveCompileSdk = (
+			compileSdk: number,
+			installedTargets: string[],
+		): number => {
+			const testInjector = createTestInjector();
+			testInjector.register("options", { compileSdk });
+			const androidToolsInfo: any = testInjector.resolve(AndroidToolsInfo);
+			return androidToolsInfo.getCompileSdkVersion(installedTargets, 36);
+		};
+
+		it("accepts a user-specified compile sdk matching an exact installed target", () => {
+			assert.equal(resolveCompileSdk(36, ["android-35", "android-36"]), 36);
+		});
+
+		it("accepts a user-specified compile sdk installed as a minor-versioned target", () => {
+			assert.equal(
+				resolveCompileSdk(37, ["android-36", "android-37.0", "android-37.1"]),
+				37,
+			);
+		});
+
+		it("fails when the user-specified compile sdk is not installed", () => {
+			assert.throws(
+				() => resolveCompileSdk(38, ["android-36", "android-37.0"]),
+				"You have specified '38' for compile sdk, but it is not installed on your system.",
+			);
+		});
+
+		it("does not treat extension targets as the base platform", () => {
+			assert.throws(
+				() => resolveCompileSdk(35, ["android-34", "android-35-ext15"]),
+				"You have specified '35' for compile sdk, but it is not installed on your system.",
+			);
+		});
+	});
+
 	describe("validateJavacVersion", () => {
 		it("throws error when passing showWarningsAsErrors to true and javac is not installed", () => {
 			const testInjector = createTestInjector();
-			const androidToolsInfo = testInjector.resolve<IAndroidToolsInfo>(
-				AndroidToolsInfo
-			);
+			const androidToolsInfo =
+				testInjector.resolve<IAndroidToolsInfo>(AndroidToolsInfo);
 			assert.throws(
 				() =>
 					androidToolsInfo.validateJavacVersion(null, {
 						showWarningsAsErrors: true,
 					}),
-				"Error executing command 'javac'. Make sure you have installed The Java Development Kit (JDK) and set JAVA_HOME environment variable."
+				"Error executing command 'javac'. Make sure you have installed The Java Development Kit (JDK) and set JAVA_HOME environment variable.",
 			);
 		});
 	});