Skip to content

Add support for android-36.1 SDK targets #6011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 6 commits into
base: main
Choose a base branch
from
+28 −20
Draft

Add support for android-36.1 SDK targets #6011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
609113e
feat: add android 36.1 sdk target support
Copilot Apr 14, 2026
a94b484
chore: preserve android sdk target ordering
Copilot Apr 14, 2026
cb78629
test: clarify android sdk support case name
Copilot Apr 14, 2026
1c80590
test: assert final android sdk target
Copilot Apr 14, 2026
5c84160
test: split android 36.1 runtime cases
Copilot Apr 14, 2026
480ffc9
test: clarify android sdk support descriptions
Copilot Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/common/mobile/emulator-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export class EmulatorHelper implements Mobile.IEmulatorHelper {
// https://developer.android.com/guide/topics/manifest/uses-sdk-element
public mapAndroidApiLevelToVersion = {
"android-36": "16.0.0",
"android-36.1": "16.0.0",
"android-35": "15.0.0",
"android-34": "14.0.0",
"android-33": "13.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/doctor/src/android-tools-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
"android-34",
"android-35",
"android-36",
"android-36.1",
];

const isRuntimeVersionLessThan = (targetVersion: string) => {
Expand Down
46 changes: 26 additions & 20 deletions packages/doctor/test/android-tools-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ describe("androidToolsInfo", () => {
"android-34",
"android-35",
"android-36",
"android-36.1",
];
}
},
Expand Down Expand Up @@ -111,38 +112,43 @@ describe("androidToolsInfo", () => {
});

describe("supportedAndroidSdks", () => {
const assertSupportedRange = (
const assertSupportedTargets = (
runtimeVersion: string,
min: number,
max: number,
expectedTargets: string[],
) => {
let cnt = 0;
const androidToolsInfo = getAndroidToolsInfo(runtimeVersion);
const supportedTargets = androidToolsInfo.getSupportedTargets("test");
for (let i = 0; i < supportedTargets.length; i++) {
assert.equal(supportedTargets[i], `android-${min + i}`);
cnt = min + i;
}
assert.equal(cnt, max);
assert.deepEqual(supportedTargets, expectedTargets);
};

it("runtime 6.0.0 should support android-17 - android-28", () => {
const min = 17;
const max = 28;
assertSupportedRange("6.0.0", min, max);
assertSupportedTargets(
"6.0.0",
Array.from({ length: 12 }, (_, index) => `android-${17 + index}`),
);
});

it("runtime 8.1.0 should support android-17 - android-30", () => {
const min = 17;
const max = 30;
assertSupportedRange("8.1.0", min, max);
assertSupportedTargets(
"8.1.0",
Array.from({ length: 14 }, (_, index) => `android-${17 + index}`),
);
});

it("runtime 8.2.0 should support android-17 - android-34", () => {
const min = 17;
const max = 36;
assertSupportedRange("8.2.0", min, max);
assertSupportedRange("8.3.0", min, max);
it("runtime 8.2.0 should support android-17 through android-36 and android-36.1", () => {
const expectedTargets = [
...Array.from({ length: 20 }, (_, index) => `android-${17 + index}`),
"android-36.1",
];
assertSupportedTargets("8.2.0", expectedTargets);
});

it("runtime 8.3.0 should support android-17 through android-36 and android-36.1", () => {
const expectedTargets = [
...Array.from({ length: 20 }, (_, index) => `android-${17 + index}`),
"android-36.1",
];
assertSupportedTargets("8.3.0", expectedTargets);
});
});

Expand Down