Skip to content

Commit de2cb8c

Browse files
authored
feat(android): api level 36 + start up emulator with unknown target versions (#5842)
1 parent debc85a commit de2cb8c

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

lib/common/mobile/android/android-emulator-services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export class AndroidEmulatorServices
235235
const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
236236
const bestVersion = best && best.version && semver.coerce(best.version);
237237

238-
return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;
238+
return !bestVersion || semver.gte(bestVersion, minVersion) ? best : null;
239239
}
240240

241241
private async waitForEmulatorBootToComplete(

lib/common/mobile/emulator-helper.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { injector } from "../yok";
55
export class EmulatorHelper implements Mobile.IEmulatorHelper {
66
// https://developer.android.com/guide/topics/manifest/uses-sdk-element
77
public mapAndroidApiLevelToVersion = {
8+
"android-36": "16.0.0",
89
"android-35": "15.0.0",
910
"android-34": "14.0.0",
1011
"android-33": "13.0.0",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
3232
"android-33",
3333
"android-34",
3434
"android-35",
35+
"android-36",
3536
];
3637

3738
const isRuntimeVersionLessThan = (targetVersion: string) => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ describe("androidToolsInfo", () => {
7070
"android-33",
7171
"android-34",
7272
"android-35",
73+
"android-36",
7374
];
7475
}
7576
},

0 commit comments

Comments
 (0)