feat(doctor): add sdk 34 support

Author: rigor789

lib/common/mobile/emulator-helper.ts

@@ -5,6 +5,7 @@ import { injector } from "../yok";
 export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
+		"android-34": "14.0.0",
 		"android-33": "13.0.0",
 		"android-32": "12.0.0",
 		"android-31": "12.0.0",

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.6.2",
+  "version": "8.6.3",
   "author": "NativeScript <[email protected]>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -55,7 +55,7 @@
     "mobile"
   ],
   "dependencies": {
-    "@nativescript/doctor": "2.0.11",
+    "@nativescript/doctor": "2.0.12",
     "@nativescript/schematics-executor": "0.0.2",
     "@npmcli/arborist": "^7.2.0",
     "@npmcli/move-file": "^2.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/doctor",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "src/index.js",
   "types": "./typings/nativescript-doctor.d.ts",

packages/doctor/package.json

@@ -30,6 +30,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			"android-31",
 			"android-32",
 			"android-33",
+			"android-34",
 		];
 
 		const isRuntimeVersionLessThan = (targetVersion: string) => {
@@ -75,9 +76,8 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 		config: Partial<NativeScriptDoctor.IProjectDir> = {}
 	): NativeScriptDoctor.IAndroidToolsInfoData {
 		if (!this.toolsInfo) {
-			const infoData: NativeScriptDoctor.IAndroidToolsInfoData = Object.create(
-				null
-			);
+			const infoData: NativeScriptDoctor.IAndroidToolsInfoData =
+				Object.create(null);
 			infoData.androidHomeEnvVar = this.androidHome;
 			infoData.installedTargets = this.getInstalledTargets();
 			infoData.compileSdkVersion = this.getCompileSdk(
@@ -99,14 +99,18 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 		const toolsInfoData = this.getToolsInfo(config);
 		const isAndroidHomeValid = this.isAndroidHomeValid();
 		if (!toolsInfoData.compileSdkVersion) {
-			const supportedTargetsForAndroidRuntime = this.getSupportedTargets(config.projectDir)
+			const supportedTargetsForAndroidRuntime = this.getSupportedTargets(
+				config.projectDir
+			);
 			errors.push({
 				warning: [
 					`Cannot find a compatible Android SDK for compilation.`,
 					`To be able to build for Android with your current android runtime, install one of the following supported Android SDK targets:`,
-					...supportedTargetsForAndroidRuntime.map(target => `  ${target}`),
-					`Supported targets vary based on what android runtime you have installed. Currently your app uses @nativescript/android ${this.getRuntimeVersion({ projectDir: config.projectDir })}`
-				].join('\n'),
+					...supportedTargetsForAndroidRuntime.map((target) => `  ${target}`),
+					`Supported targets vary based on what android runtime you have installed. Currently your app uses @nativescript/android ${this.getRuntimeVersion(
+						{ projectDir: config.projectDir }
+					)}`,
+				].join("\n"),
 				additionalInformation: `Run \`\$ ${this.getPathToSdkManagementTool()}\` to manage your Android SDK versions.`,
 				platforms: [Constants.ANDROID_PLATFORM_NAME],
 			});
@@ -530,9 +534,10 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 		return !errors && !errors.length;
 	}
 
-	private getAndroidRuntimePackageFromProjectDir(
-		projectDir: string
-	): { name: string; version: string } {
+	private getAndroidRuntimePackageFromProjectDir(projectDir: string): {
+		name: string;
+		version: string;
+	} {
 		if (!projectDir || !this.fs.exists(projectDir)) {
 			return null;
 		}
@@ -542,9 +547,8 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			return null;
 		}
 
-		const content = this.fs.readJson<INativeScriptProjectPackageJson>(
-			pathToPackageJson
-		);
+		const content =
+			this.fs.readJson<INativeScriptProjectPackageJson>(pathToPackageJson);
 
 		if (!content) {
 			return null;

packages/doctor/src/android-tools-info.ts

@@ -56,6 +56,7 @@ describe("androidToolsInfo", () => {
 						"31.0.0",
 						"32.0.0",
 						"33.0.0",
+						"34.0.0",
 					];
 				} else {
 					return [
@@ -67,6 +68,7 @@ describe("androidToolsInfo", () => {
 						"android-31",
 						"android-32",
 						"android-33",
+						"android-34",
 					];
 				}
 			},
@@ -91,18 +93,18 @@ describe("androidToolsInfo", () => {
 			assert.equal(toolsInfo.compileSdkVersion, 30);
 		});
 
-		it("runtime 8.1.1 - 30", () => {
+		it("runtime < 8.2.0 - 30", () => {
 			const androidToolsInfo = getAndroidToolsInfo("8.1.1");
 			const toolsInfo = androidToolsInfo.getToolsInfo({ projectDir: "test" });
 
 			assert.equal(toolsInfo.compileSdkVersion, 30);
 		});
 
-		it("runtime 8.2.0 - 32", () => {
+		it("runtime >8.2.0 - latest", () => {
 			const androidToolsInfo = getAndroidToolsInfo("8.2.0");
 			const toolsInfo = androidToolsInfo.getToolsInfo({ projectDir: "test" });
 
-			assert.equal(toolsInfo.compileSdkVersion, 33);
+			assert.equal(toolsInfo.compileSdkVersion, 34);
 		});
 	});
 
@@ -134,9 +136,9 @@ describe("androidToolsInfo", () => {
 			assertSupportedRange("8.1.0", min, max);
 		});
 
-		it("runtime 8.2.0 should support android-17 - android-33", () => {
+		it("runtime 8.2.0 should support android-17 - android-34", () => {
 			const min = 17;
-			const max = 33;
+			const max = 34;
 			assertSupportedRange("8.2.0", min, max);
 			assertSupportedRange("8.3.0", min, max);
 		});

packages/doctor/test/android-tools-info.ts

@@ -819,7 +819,17 @@ end`,
 				command: string,
 				options?: any,
 				execOptions?: IExecOptions
-			): Promise<any> => null;
+			): Promise<any> => {
+				if (command === "arch -x86_64 pod --version") {
+					// This is the command that is used to check if cocoapods is installed under Rosetta 2
+					return {
+						stdout: "Bad CPU type in executable",
+						stderr: "",
+						exitCode: 0,
+					};
+				}
+				return null;
+			};
 			childProcess.spawnFromEvent = async (
 				command: string,
 				args: string[],
@@ -839,9 +849,8 @@ end`,
 			}`, async () => {
 				const config = testInjector.resolve<IConfiguration>("config");
 				config.USE_POD_SANDBOX = podExecutable === "sandbox-pod";
-				const childProcess = testInjector.resolve<IChildProcess>(
-					"childProcess"
-				);
+				const childProcess =
+					testInjector.resolve<IChildProcess>("childProcess");
 				let commandCalled = "";
 				childProcess.spawnFromEvent = async (
 					command: string,
@@ -949,9 +958,10 @@ end`,
 			projectPodfileContent = "";
 		});
 
-		function setupMocks(
-			pods: any[]
-		): { projectData: IProjectData; platformData: any } {
+		function setupMocks(pods: any[]): {
+			projectData: IProjectData;
+			platformData: any;
+		} {
 			const podsPaths = pods.map((p) => p.path);
 			const projectData = testInjector.resolve("projectData");
 			projectData.getAppResourcesDirectoryPath = () =>
@@ -990,13 +1000,11 @@ end`,
 
 		const testCasesWithApplyAndRemove = [
 			{
-				name:
-					"should select the podfile with highest platform after Podfile from App_Resources has been deleted",
+				name: "should select the podfile with highest platform after Podfile from App_Resources has been deleted",
 				pods: [
 					{
 						name: "mySecondPluginWithPlatform",
-						path:
-							"node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile",
+						path: "node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile",
 						content: `platform :ios, '10.0'`,
 					},
 					{
@@ -1180,8 +1188,7 @@ pod 'myPod' ~> 0.3.4
 end`,
 			},
 			{
-				name:
-					"should select the platform with highest version from plugins when no Podfile in App_Resources",
+				name: "should select the platform with highest version from plugins when no Podfile in App_Resources",
 				pods: [
 					{
 						name: "pluginWithPlatform",
@@ -1220,8 +1227,7 @@ pod 'myPod' ~> 0.3.4
 end`,
 			},
 			{
-				name:
-					"should select the platform without version when no Podfile in App_Resources",
+				name: "should select the platform without version when no Podfile in App_Resources",
 				pods: [
 					{
 						name: "myPluginWithoutPlatform",
@@ -1260,8 +1266,7 @@ platform :ios
 end`,
 			},
 			{
-				name:
-					"shouldn't replace the platform without version when no Podfile in App_Resources",
+				name: "shouldn't replace the platform without version when no Podfile in App_Resources",
 				pods: [
 					{
 						name: "myPluginWithoutPlatform",
@@ -1300,13 +1305,11 @@ platform :ios
 end`,
 			},
 			{
-				name:
-					"should select platform from plugins when the podfile in App_Resources/iOS/Podfile has no platform",
+				name: "should select platform from plugins when the podfile in App_Resources/iOS/Podfile has no platform",
 				pods: [
 					{
 						name: "mySecondPluginWithPlatform",
-						path:
-							"node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile",
+						path: "node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile",
 						content: `platform :ios, '10.0'`,
 					},
 					{