diff --git a/lib/common/mobile/emulator-helper.ts b/lib/common/mobile/emulator-helper.ts index 461e46e4ab..93cf02e35f 100644 --- a/lib/common/mobile/emulator-helper.ts +++ b/lib/common/mobile/emulator-helper.ts @@ -5,6 +5,8 @@ import { injector } from "../yok"; export class EmulatorHelper implements Mobile.IEmulatorHelper { // https://developer.android.com/guide/topics/manifest/uses-sdk-element public mapAndroidApiLevelToVersion = { + "android-33": "13.0.0", + "android-32": "12.0.0", "android-31": "12.0.0", "android-30": "11.0.0", "android-29": "10.0.0", diff --git a/package-lock.json b/package-lock.json index b78910b3e6..7b12c2e034 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@nativescript/doctor": "2.0.8", + "@nativescript/doctor": "2.0.9", "@nativescript/schematics-executor": "0.0.2", "@rigor789/resolve-package-path": "^1.0.5", "axios": "^0.21.1", @@ -692,9 +692,9 @@ "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" }, "node_modules/@nativescript/doctor": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.8.tgz", - "integrity": "sha512-/jVGBBBBY2BX1IwriDyXHNi0ZNAkSuzdDQuGY3nUl3BDLu5AM+FFg4qCG3D9IW664WLbA1KbJQd+HUSjRHM/ZQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.9.tgz", + "integrity": "sha512-/4Y3wkB5fQHr7oZVl15uQz1vwZPeL5dxVdts/djakJczIFKHozTL4k31rH1/82fExB5HvzzfJZhEvocwkS+/lw==", "dependencies": { "lodash": "4.17.21", "osenv": "0.1.5", @@ -13607,9 +13607,9 @@ "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" }, "@nativescript/doctor": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.8.tgz", - "integrity": "sha512-/jVGBBBBY2BX1IwriDyXHNi0ZNAkSuzdDQuGY3nUl3BDLu5AM+FFg4qCG3D9IW664WLbA1KbJQd+HUSjRHM/ZQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.9.tgz", + "integrity": "sha512-/4Y3wkB5fQHr7oZVl15uQz1vwZPeL5dxVdts/djakJczIFKHozTL4k31rH1/82fExB5HvzzfJZhEvocwkS+/lw==", "requires": { "lodash": "4.17.21", "osenv": "0.1.5", diff --git a/package.json b/package.json index a24844e1ea..cff98a3014 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "mobile" ], "dependencies": { - "@nativescript/doctor": "2.0.8", + "@nativescript/doctor": "2.0.9", "@nativescript/schematics-executor": "0.0.2", "@rigor789/resolve-package-path": "^1.0.5", "axios": "^0.21.1", diff --git a/packages/doctor/package.json b/packages/doctor/package.json index 2da24df6c2..660e545fba 100644 --- a/packages/doctor/package.json +++ b/packages/doctor/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/doctor", - "version": "2.0.8", + "version": "2.0.9", "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", diff --git a/packages/doctor/src/android-tools-info.ts b/packages/doctor/src/android-tools-info.ts index f2676ccbdf..e17f0f9178 100644 --- a/packages/doctor/src/android-tools-info.ts +++ b/packages/doctor/src/android-tools-info.ts @@ -29,6 +29,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo { "android-30", "android-31", "android-32", + "android-33", ]; const isRuntimeVersionLessThan = (targetVersion: string) => { diff --git a/packages/doctor/test/android-tools-info.ts b/packages/doctor/test/android-tools-info.ts index 3ae274840d..bcf1f298e9 100644 --- a/packages/doctor/test/android-tools-info.ts +++ b/packages/doctor/test/android-tools-info.ts @@ -55,6 +55,7 @@ describe("androidToolsInfo", () => { "30.0.0", "31.0.0", "32.0.0", + "33.0.0", ]; } else { return [ @@ -65,6 +66,7 @@ describe("androidToolsInfo", () => { "android-30", "android-31", "android-32", + "android-33", ]; } }, @@ -100,7 +102,7 @@ describe("androidToolsInfo", () => { const androidToolsInfo = getAndroidToolsInfo("8.2.0"); const toolsInfo = androidToolsInfo.getToolsInfo({ projectDir: "test" }); - assert.equal(toolsInfo.compileSdkVersion, 32); + assert.equal(toolsInfo.compileSdkVersion, 33); }); }); @@ -132,10 +134,11 @@ describe("androidToolsInfo", () => { assertSupportedRange("8.1.0", min, max); }); - it("runtime 8.2.0 should support android-17 - android-32", () => { + it("runtime 8.2.0 should support android-17 - android-33", () => { const min = 17; - const max = 32; + const max = 33; assertSupportedRange("8.2.0", min, max); + assertSupportedRange("8.3.0", min, max); }); }); diff --git a/yarn.lock b/yarn.lock index fb036e6eac..d8aa2e9c63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -340,10 +340,10 @@ "resolved" "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz" "version" "1.1.1" -"@nativescript/doctor@2.0.8": - "integrity" "sha512-/jVGBBBBY2BX1IwriDyXHNi0ZNAkSuzdDQuGY3nUl3BDLu5AM+FFg4qCG3D9IW664WLbA1KbJQd+HUSjRHM/ZQ==" - "resolved" "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.8.tgz" - "version" "2.0.8" +"@nativescript/doctor@2.0.9": + "integrity" "sha512-/4Y3wkB5fQHr7oZVl15uQz1vwZPeL5dxVdts/djakJczIFKHozTL4k31rH1/82fExB5HvzzfJZhEvocwkS+/lw==" + "resolved" "https://registry.npmjs.org/@nativescript/doctor/-/doctor-2.0.9.tgz" + "version" "2.0.9" dependencies: "lodash" "4.17.21" "osenv" "0.1.5"