Merge branch 'main' into release/v2

* main: Prepare for release 2.37.0. Build build tools 36.0.0, SDK command-line tools 12.0. (#467) Update to Node 24. (#466) Modernize test-fixture project. (#465)
2026-08-31 17:49:33 +00:00 · 2026-03-14 19:50:13 +11:00
parent 5d6e86df22 9644b1a1f9
commit e89f39f1ab
30 changed files with 4528 additions and 3673 deletions
@@ -9,5 +9,5 @@ jobs:
  validate-typings:
    runs-on: "ubuntu-latest"
    steps:
-      - uses: actions/checkout@v4
-      - uses: krzema12/github-actions-typing@v0
+      - uses: actions/checkout@v6
+      - uses: krzema12/github-actions-typing@v2
@@ -47,7 +47,7 @@ jobs:

    steps:
    - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: build, test and lint
      run: |
@@ -56,12 +56,12 @@ jobs:
        npm run lint
        npm test

-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
      with:
        distribution: 'zulu'
-        java-version: 23
+        java-version: 25

-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
      id: avd-cache
      with:
        path: |
@@ -70,7 +70,7 @@ jobs:
          ~/.android/debug.keystore
        key: avd-${{ matrix.api-level }}-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.arch }}

-    - uses: gradle/actions/setup-gradle@v4
+    - uses: gradle/actions/setup-gradle@v5

    - name: assemble tests
      working-directory: test-fixture
@@ -41,7 +41,7 @@ jobs:
    
    steps:
    - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: build, test and lint
      run: |
@@ -50,12 +50,12 @@ jobs:
        npm run lint
        npm test

-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
      with:
        distribution: 'zulu'
-        java-version: 23
+        java-version: 25

-    - uses: gradle/actions/setup-gradle@v4
+    - uses: gradle/actions/setup-gradle@v5

    - name: enable KVM for linux runners
      if: runner.os == 'Linux'
@@ -0,0 +1 @@
+24
@@ -2,6 +2,12 @@

 ## Unreleased

+## v2.37.0
+
+* Update SDK build tools to `36.0.0`, update SDK command-line tools to `20.0`. - [#467](https://github.com/ReactiveCircus/android-emulator-runner/pull/467)
+* Run action on Node 24. - [#466](https://github.com/ReactiveCircus/android-emulator-runner/pull/466)
+* Update Node and npm packages. - [#466](https://github.com/ReactiveCircus/android-emulator-runner/pull/466)
+
 ## v2.36.0

 * Remove `--abi` option to better support 16-KB-based system images (#456).
@@ -49,7 +49,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Enable KVM
        run: |
@@ -76,7 +76,7 @@ jobs:
        target: [default, google_apis]
    steps:
      - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Enable KVM
        run: |
@@ -102,7 +102,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Enable KVM
        run: |
@@ -127,7 +127,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Enable KVM
        run: |
@@ -146,8 +146,8 @@ jobs:

 We can significantly reduce emulator startup time by setting up AVD snapshot caching:

-1. add a `gradle/actions/setup-gradle@v4` step for caching Gradle, more details see [#229](https://github.com/ReactiveCircus/android-emulator-runner/issues/229)
-2. add an `actions/cache@v4` step for caching the `avd`
+1. add a `gradle/actions/setup-gradle@v5` step for caching Gradle, more details see [#229](https://github.com/ReactiveCircus/android-emulator-runner/issues/229)
+2. add an `actions/cache@v5` step for caching the `avd`
 3. add a `reactivecircus/android-emulator-runner@v2` step to generate a clean snapshot - specify `emulator-options` without `no-snapshot`
 4. add another `reactivecircus/android-emulator-runner@v2` step to run your tests using existing AVD / snapshot - specify `emulator-options` with `no-snapshot-save`

@@ -160,7 +160,7 @@ jobs:
        api-level: [21, 23, 29]
    steps:
      - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Enable KVM
        run: |
@@ -169,10 +169,10 @@ jobs:
          sudo udevadm trigger --name-match=kvm

      - name: Gradle cache
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
        
      - name: AVD cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: avd-cache
        with:
          path: |
@@ -74,5 +74,5 @@ inputs:
  pre-emulator-launch-script:
    description: 'custom script to run after creating the AVD and before launching the emulator - e.g. `./adjust-emulator-configs.sh`'
 runs:
-  using: 'node20'
+  using: 'node24'
  main: 'lib/main.js'
@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChannelId = void 0;
+exports.getChannelId = getChannelId;
 function getChannelId(channelName) {
    if (channelName === 'stable') {
        return 0;
@@ -18,4 +18,3 @@ function getChannelId(channelName) {
        throw new Error(`Unexpected channel name: '${channelName}'.`);
    }
 }
-exports.getChannelId = getChannelId;
@@ -15,175 +15,165 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
    o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.killEmulator = exports.launchEmulator = exports.createAvd = void 0;
+exports.createAvd = createAvd;
+exports.launchEmulator = launchEmulator;
+exports.killEmulator = killEmulator;
 const exec = __importStar(require("@actions/exec"));
 const fs = __importStar(require("fs"));
 /**
 * Creates a new AVD instance with the specified configurations.
 */
-function createAvd(arch, avdName, cores, diskSize, enableHardwareKeyboard, forceAvdCreation, heapSize, profile, ramSize, sdcardPathOrSize, systemImageApiLevel, target) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            console.log(`::group::Create AVD`);
-            // create a new AVD if AVD directory does not already exist or forceAvdCreation is true
-            const avdPath = `${process.env.ANDROID_AVD_HOME}/${avdName}.avd`;
-            if (!fs.existsSync(avdPath) || forceAvdCreation) {
-                const profileOption = profile.trim() !== '' ? `--device '${profile}'` : '';
-                const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
-                console.log(`Creating AVD.`);
-                yield exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
+async function createAvd(arch, avdName, cores, diskSize, enableHardwareKeyboard, forceAvdCreation, heapSize, profile, ramSize, sdcardPathOrSize, systemImageApiLevel, target) {
+    try {
+        console.log(`::group::Create AVD`);
+        // create a new AVD if AVD directory does not already exist or forceAvdCreation is true
+        const avdPath = `${process.env.ANDROID_AVD_HOME}/${avdName}.avd`;
+        if (!fs.existsSync(avdPath) || forceAvdCreation) {
+            const profileOption = profile.trim() !== '' ? `--device '${profile}'` : '';
+            const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
+            console.log(`Creating AVD.`);
+            await exec.exec(`sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`);
+        }
+        if (cores || ramSize || heapSize || enableHardwareKeyboard || diskSize) {
+            const configEntries = [];
+            if (cores) {
+                configEntries.push(`hw.cpu.ncore=${cores}`);
            }
-            if (cores || ramSize || heapSize || enableHardwareKeyboard || diskSize) {
-                const configEntries = [];
-                if (cores) {
-                    configEntries.push(`hw.cpu.ncore=${cores}`);
-                }
-                if (ramSize) {
-                    configEntries.push(`hw.ramSize=${ramSize}`);
-                }
-                if (heapSize) {
-                    configEntries.push(`hw.heapSize=${heapSize}`);
-                }
-                if (enableHardwareKeyboard) {
-                    configEntries.push('hw.keyboard=yes');
-                }
-                if (diskSize) {
-                    configEntries.push(`disk.dataPartition.size=${diskSize}`);
-                }
-                if (configEntries.length > 0) {
-                    const configContent = configEntries.join('\\n') + '\\n';
-                    yield exec.exec(`sh -c \\"printf '${configContent}' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini"`);
-                }
+            if (ramSize) {
+                configEntries.push(`hw.ramSize=${ramSize}`);
+            }
+            if (heapSize) {
+                configEntries.push(`hw.heapSize=${heapSize}`);
+            }
+            if (enableHardwareKeyboard) {
+                configEntries.push('hw.keyboard=yes');
+            }
+            if (diskSize) {
+                configEntries.push(`disk.dataPartition.size=${diskSize}`);
+            }
+            if (configEntries.length > 0) {
+                const configContent = configEntries.join('\\n') + '\\n';
+                await exec.exec(`sh -c \\"printf '${configContent}' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini"`);
            }
        }
-        finally {
-            console.log(`::endgroup::`);
-        }
-    });
+    }
+    finally {
+        console.log(`::endgroup::`);
+    }
 }
-exports.createAvd = createAvd;
 /**
 * Launches an existing AVD instance with the specified configurations.
 */
-function launchEmulator(avdName, disableAnimations, disableLinuxHardwareAcceleration, disableSpellChecker, emulatorBootTimeout, emulatorOptions, enableHardwareKeyboard, port) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            console.log(`::group::Launch Emulator`);
-            // turn off hardware acceleration on Linux
-            if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {
-                console.log('Disabling Linux hardware acceleration.');
-                emulatorOptions += ' -accel off';
-            }
-            // start emulator
-            console.log('Starting emulator.');
-            yield exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -port ${port} -avd "${avdName}" ${emulatorOptions} &"`, [], {
-                listeners: {
-                    stderr: (data) => {
-                        if (data.toString().includes('invalid command-line parameter')) {
-                            throw new Error(data.toString());
-                        }
-                    },
+async function launchEmulator(avdName, disableAnimations, disableLinuxHardwareAcceleration, disableSpellChecker, emulatorBootTimeout, emulatorOptions, enableHardwareKeyboard, port) {
+    try {
+        console.log(`::group::Launch Emulator`);
+        // turn off hardware acceleration on Linux
+        if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {
+            console.log('Disabling Linux hardware acceleration.');
+            emulatorOptions += ' -accel off';
+        }
+        // start emulator
+        console.log('Starting emulator.');
+        await exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -port ${port} -avd "${avdName}" ${emulatorOptions} &"`, [], {
+            listeners: {
+                stderr: (data) => {
+                    if (data.toString().includes('invalid command-line parameter')) {
+                        throw new Error(data.toString());
+                    }
                },
-            });
-            // wait for emulator to complete booting
-            yield waitForDevice(port, emulatorBootTimeout);
-            yield adb(port, `shell input keyevent 82`);
-            if (disableAnimations) {
-                console.log('Disabling animations.');
-                yield adb(port, `shell settings put global window_animation_scale 0.0`);
-                yield adb(port, `shell settings put global transition_animation_scale 0.0`);
-                yield adb(port, `shell settings put global animator_duration_scale 0.0`);
-            }
-            if (disableSpellChecker) {
-                yield adb(port, `shell settings put secure spell_checker_enabled 0`);
-            }
-            if (enableHardwareKeyboard) {
-                yield adb(port, `shell settings put secure show_ime_with_hard_keyboard 0`);
-            }
+            },
+        });
+        // wait for emulator to complete booting
+        await waitForDevice(port, emulatorBootTimeout);
+        await adb(port, `shell input keyevent 82`);
+        if (disableAnimations) {
+            console.log('Disabling animations.');
+            await adb(port, `shell settings put global window_animation_scale 0.0`);
+            await adb(port, `shell settings put global transition_animation_scale 0.0`);
+            await adb(port, `shell settings put global animator_duration_scale 0.0`);
        }
-        finally {
-            console.log(`::endgroup::`);
+        if (disableSpellChecker) {
+            await adb(port, `shell settings put secure spell_checker_enabled 0`);
        }
-    });
+        if (enableHardwareKeyboard) {
+            await adb(port, `shell settings put secure show_ime_with_hard_keyboard 0`);
+        }
+    }
+    finally {
+        console.log(`::endgroup::`);
+    }
 }
-exports.launchEmulator = launchEmulator;
 /**
 * Kills the running emulator on the default port.
 */
-function killEmulator(port) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            console.log(`::group::Terminate Emulator`);
-            yield adb(port, `emu kill`);
-        }
-        catch (error) {
-            console.log(error instanceof Error ? error.message : error);
-        }
-        finally {
-            console.log(`::endgroup::`);
-        }
-    });
+async function killEmulator(port) {
+    try {
+        console.log(`::group::Terminate Emulator`);
+        await adb(port, `emu kill`);
+    }
+    catch (error) {
+        console.log(error instanceof Error ? error.message : error);
+    }
+    finally {
+        console.log(`::endgroup::`);
+    }
 }
-exports.killEmulator = killEmulator;
-function adb(port, command) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield exec.exec(`adb -s emulator-${port} ${command}`);
-    });
+async function adb(port, command) {
+    return await exec.exec(`adb -s emulator-${port} ${command}`);
 }
 /**
 * Wait for emulator to boot.
 */
-function waitForDevice(port, emulatorBootTimeout) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let booted = false;
-        let attempts = 0;
-        const retryInterval = 2; // retry every 2 seconds
-        const maxAttempts = emulatorBootTimeout / 2;
-        while (!booted) {
-            try {
-                let result = '';
-                yield exec.exec(`adb -s emulator-${port} shell getprop sys.boot_completed`, [], {
-                    listeners: {
-                        stdout: (data) => {
-                            result += data.toString();
-                        },
+async function waitForDevice(port, emulatorBootTimeout) {
+    let booted = false;
+    let attempts = 0;
+    const retryInterval = 2; // retry every 2 seconds
+    const maxAttempts = emulatorBootTimeout / 2;
+    while (!booted) {
+        try {
+            let result = '';
+            await exec.exec(`adb -s emulator-${port} shell getprop sys.boot_completed`, [], {
+                listeners: {
+                    stdout: (data) => {
+                        result += data.toString();
                    },
-                });
-                if (result.trim() === '1') {
-                    console.log('Emulator booted.');
-                    booted = true;
-                    break;
-                }
+                },
+            });
+            if (result.trim() === '1') {
+                console.log('Emulator booted.');
+                booted = true;
+                break;
            }
-            catch (error) {
-                console.warn(error instanceof Error ? error.message : error);
-            }
-            if (attempts < maxAttempts) {
-                yield delay(retryInterval * 1000);
-            }
-            else {
-                throw new Error(`Timeout waiting for emulator to boot.`);
-            }
-            attempts++;
        }
-    });
+        catch (error) {
+            console.warn(error instanceof Error ? error.message : error);
+        }
+        if (attempts < maxAttempts) {
+            await delay(retryInterval * 1000);
+        }
+        else {
+            throw new Error(`Timeout waiting for emulator to boot.`);
+        }
+        attempts++;
+    }
 }
 function delay(ms) {
    return new Promise((resolve) => setTimeout(resolve, ms));
@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkPort = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.playstoreTargetSubstitution = exports.MAX_PORT = exports.MIN_PORT = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.MIN_API_LEVEL = void 0;
+exports.MAX_PORT = exports.MIN_PORT = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.MIN_API_LEVEL = void 0;
+exports.playstoreTargetSubstitution = playstoreTargetSubstitution;
+exports.checkArch = checkArch;
+exports.checkChannel = checkChannel;
+exports.checkForceAvdCreation = checkForceAvdCreation;
+exports.checkPort = checkPort;
+exports.checkDisableAnimations = checkDisableAnimations;
+exports.checkDisableSpellchecker = checkDisableSpellchecker;
+exports.checkDisableLinuxHardwareAcceleration = checkDisableLinuxHardwareAcceleration;
+exports.checkEnableHardwareKeyboard = checkEnableHardwareKeyboard;
+exports.checkEmulatorBuild = checkEmulatorBuild;
+exports.checkDiskSize = checkDiskSize;
 exports.MIN_API_LEVEL = 15;
 exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a'];
 exports.VALID_CHANNELS = ['stable', 'beta', 'dev', 'canary'];
@@ -15,25 +26,21 @@ function playstoreTargetSubstitution(target) {
        return 'google_apis_playstore_ps16k';
    return target;
 }
-exports.playstoreTargetSubstitution = playstoreTargetSubstitution;
 function checkArch(arch) {
    if (!exports.VALID_ARCHS.includes(arch)) {
        throw new Error(`Value for input.arch '${arch}' is unknown. Supported options: ${exports.VALID_ARCHS}.`);
    }
 }
-exports.checkArch = checkArch;
 function checkChannel(channel) {
    if (!exports.VALID_CHANNELS.includes(channel)) {
        throw new Error(`Value for input.channel '${channel}' is unknown. Supported options: ${exports.VALID_CHANNELS}.`);
    }
 }
-exports.checkChannel = checkChannel;
 function checkForceAvdCreation(forceAvdCreation) {
    if (!isValidBoolean(forceAvdCreation)) {
        throw new Error(`Input for input.force-avd-creation should be either 'true' or 'false'.`);
    }
 }
-exports.checkForceAvdCreation = checkForceAvdCreation;
 function checkPort(port) {
    if (port < exports.MIN_PORT || port > exports.MAX_PORT) {
        throw new Error(`Emulator port is outside of the supported port range [${exports.MIN_PORT}, ${exports.MAX_PORT}], was ${port}`);
@@ -42,37 +49,31 @@ function checkPort(port) {
        throw new Error(`Emulator port has to be even, was ${port}`);
    }
 }
-exports.checkPort = checkPort;
 function checkDisableAnimations(disableAnimations) {
    if (!isValidBoolean(disableAnimations)) {
        throw new Error(`Input for input.disable-animations should be either 'true' or 'false'.`);
    }
 }
-exports.checkDisableAnimations = checkDisableAnimations;
 function checkDisableSpellchecker(disableSpellchecker) {
    if (!isValidBoolean(disableSpellchecker)) {
        throw new Error(`Input for input.disable-spellchecker should be either 'true' or 'false'.`);
    }
 }
-exports.checkDisableSpellchecker = checkDisableSpellchecker;
 function checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAcceleration) {
    if (!(isValidBoolean(disableLinuxHardwareAcceleration) || disableLinuxHardwareAcceleration === 'auto')) {
        throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`);
    }
 }
-exports.checkDisableLinuxHardwareAcceleration = checkDisableLinuxHardwareAcceleration;
 function checkEnableHardwareKeyboard(enableHardwareKeyboard) {
    if (!isValidBoolean(enableHardwareKeyboard)) {
        throw new Error(`Input for input.enable-hw-keyboard should be either 'true' or 'false'.`);
    }
 }
-exports.checkEnableHardwareKeyboard = checkEnableHardwareKeyboard;
 function checkEmulatorBuild(emulatorBuild) {
    if (isNaN(Number(emulatorBuild)) || !Number.isInteger(Number(emulatorBuild))) {
        throw new Error(`Unexpected emulator build: '${emulatorBuild}'.`);
    }
 }
-exports.checkEmulatorBuild = checkEmulatorBuild;
 function isValidBoolean(value) {
    return value === 'true' || value === 'false';
 }
@@ -92,4 +93,3 @@ function checkDiskSize(diskSize) {
        }
    }
 }
-exports.checkDiskSize = checkDiskSize;
@@ -15,22 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
    o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const sdk_installer_1 = require("./sdk-installer");
@@ -40,194 +41,192 @@ const exec = __importStar(require("@actions/exec"));
 const script_parser_1 = require("./script-parser");
 const channel_id_mapper_1 = require("./channel-id-mapper");
 const fs_1 = require("fs");
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        let port = input_validator_1.MIN_PORT;
-        try {
-            console.log(`::group::Configure emulator`);
-            let linuxSupportKVM = false;
-            // only support running on macOS or Linux
-            if (process.platform !== 'darwin') {
-                if (process.platform === 'linux') {
-                    try {
-                        (0, fs_1.accessSync)('/dev/kvm', fs_1.constants.R_OK | fs_1.constants.W_OK);
-                        linuxSupportKVM = true;
-                    }
-                    catch (_a) {
-                        console.warn(`You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`);
-                    }
-                }
-                else {
-                    throw new Error('Unsupported virtual machine: please use either macos or ubuntu VM.');
-                }
-            }
-            // API level of the platform and system image
-            const apiLevel = core.getInput('api-level', { required: true });
-            console.log(`API level: ${apiLevel}`);
-            let systemImageApiLevel = core.getInput('system-image-api-level');
-            if (!systemImageApiLevel) {
-                systemImageApiLevel = apiLevel;
-            }
-            console.log(`System image API level: ${systemImageApiLevel}`);
-            // target of the system image
-            const target = (0, input_validator_1.playstoreTargetSubstitution)(core.getInput('target'));
-            console.log(`target: ${target}`);
-            // CPU architecture of the system image
-            const arch = core.getInput('arch');
-            (0, input_validator_1.checkArch)(arch);
-            console.log(`CPU architecture: ${arch}`);
-            // Hardware profile used for creating the AVD
-            const profile = core.getInput('profile');
-            console.log(`Hardware profile: ${profile}`);
-            // Number of cores to use for emulator
-            const cores = core.getInput('cores');
-            console.log(`Cores: ${cores}`);
-            // RAM to use for AVD
-            const ramSize = core.getInput('ram-size');
-            console.log(`RAM size: ${ramSize}`);
-            // Heap size to use for AVD
-            const heapSize = core.getInput('heap-size');
-            console.log(`Heap size: ${heapSize}`);
-            // SD card path or size used for creating the AVD
-            const sdcardPathOrSize = core.getInput('sdcard-path-or-size');
-            console.log(`SD card path or size: ${sdcardPathOrSize}`);
-            const diskSize = core.getInput('disk-size');
-            (0, input_validator_1.checkDiskSize)(diskSize);
-            console.log(`Disk size: ${diskSize}`);
-            // custom name used for creating the AVD
-            const avdName = core.getInput('avd-name');
-            console.log(`AVD name: ${avdName}`);
-            // force AVD creation
-            const forceAvdCreationInput = core.getInput('force-avd-creation');
-            (0, input_validator_1.checkForceAvdCreation)(forceAvdCreationInput);
-            const forceAvdCreation = forceAvdCreationInput === 'true';
-            console.log(`force avd creation: ${forceAvdCreation}`);
-            // Emulator boot timeout seconds
-            const emulatorBootTimeout = parseInt(core.getInput('emulator-boot-timeout'), 10);
-            console.log(`Emulator boot timeout: ${emulatorBootTimeout}`);
-            // Emulator port to use
-            port = parseInt(core.getInput('emulator-port'), 10);
-            (0, input_validator_1.checkPort)(port);
-            console.log(`emulator port: ${port}`);
-            // emulator options
-            const emulatorOptions = core.getInput('emulator-options').trim();
-            console.log(`emulator options: ${emulatorOptions}`);
-            // disable animations
-            const disableAnimationsInput = core.getInput('disable-animations');
-            (0, input_validator_1.checkDisableAnimations)(disableAnimationsInput);
-            const disableAnimations = disableAnimationsInput === 'true';
-            console.log(`disable animations: ${disableAnimations}`);
-            // disable spellchecker
-            const disableSpellcheckerInput = core.getInput('disable-spellchecker');
-            (0, input_validator_1.checkDisableSpellchecker)(disableSpellcheckerInput);
-            const disableSpellchecker = disableSpellcheckerInput === 'true';
-            console.log(`disable spellchecker: ${disableSpellchecker}`);
-            // disable linux hardware acceleration
-            let disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel');
-            (0, input_validator_1.checkDisableLinuxHardwareAcceleration)(disableLinuxHardwareAccelerationInput);
-            if (disableLinuxHardwareAccelerationInput === 'auto' && process.platform === 'linux') {
-                disableLinuxHardwareAccelerationInput = linuxSupportKVM ? 'false' : 'true';
-            }
-            const disableLinuxHardwareAcceleration = disableLinuxHardwareAccelerationInput === 'true';
-            console.log(`disable Linux hardware acceleration: ${disableLinuxHardwareAcceleration}`);
-            // enable hardware keyboard
-            const enableHardwareKeyboardInput = core.getInput('enable-hw-keyboard');
-            (0, input_validator_1.checkEnableHardwareKeyboard)(enableHardwareKeyboardInput);
-            const enableHardwareKeyboard = enableHardwareKeyboardInput === 'true';
-            console.log(`enable hardware keyboard: ${enableHardwareKeyboard}`);
-            // emulator build
-            const emulatorBuildInput = core.getInput('emulator-build');
-            if (emulatorBuildInput) {
-                (0, input_validator_1.checkEmulatorBuild)(emulatorBuildInput);
-                console.log(`using emulator build: ${emulatorBuildInput}`);
-            }
-            const emulatorBuild = !emulatorBuildInput ? undefined : emulatorBuildInput;
-            // custom working directory
-            const workingDirectoryInput = core.getInput('working-directory');
-            if (workingDirectoryInput) {
-                console.log(`custom working directory: ${workingDirectoryInput}`);
-            }
-            const workingDirectory = !workingDirectoryInput ? undefined : workingDirectoryInput;
-            // version of NDK to install
-            const ndkInput = core.getInput('ndk');
-            if (ndkInput) {
-                console.log(`version of NDK to install: ${ndkInput}`);
-            }
-            const ndkVersion = !ndkInput ? undefined : ndkInput;
-            // version of CMake to install
-            const cmakeInput = core.getInput('cmake');
-            if (cmakeInput) {
-                console.log(`version of CMake to install: ${cmakeInput}`);
-            }
-            const cmakeVersion = !cmakeInput ? undefined : cmakeInput;
-            // channelId (up to and including) to download the SDK packages from
-            const channelName = core.getInput('channel');
-            (0, input_validator_1.checkChannel)(channelName);
-            const channelId = (0, channel_id_mapper_1.getChannelId)(channelName);
-            console.log(`Channel: ${channelId} (${channelName})`);
-            // custom script to run
-            const scriptInput = core.getInput('script', { required: true });
-            const scripts = (0, script_parser_1.parseScript)(scriptInput);
-            console.log(`Script:`);
-            scripts.forEach((script) => __awaiter(this, void 0, void 0, function* () {
-                console.log(`${script}`);
-            }));
-            // custom pre emulator launch script
-            const preEmulatorLaunchScriptInput = core.getInput('pre-emulator-launch-script');
-            const preEmulatorLaunchScripts = !preEmulatorLaunchScriptInput ? undefined : (0, script_parser_1.parseScript)(preEmulatorLaunchScriptInput);
-            console.log(`Pre emulator launch script:`);
-            preEmulatorLaunchScripts === null || preEmulatorLaunchScripts === void 0 ? void 0 : preEmulatorLaunchScripts.forEach((script) => __awaiter(this, void 0, void 0, function* () {
-                console.log(`${script}`);
-            }));
-            console.log(`::endgroup::`);
-            // install SDK
-            yield (0, sdk_installer_1.installAndroidSdk)(apiLevel, systemImageApiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion);
-            // create AVD
-            yield (0, emulator_manager_1.createAvd)(arch, avdName, cores, diskSize, enableHardwareKeyboard, forceAvdCreation, heapSize, profile, ramSize, sdcardPathOrSize, systemImageApiLevel, target);
-            // execute pre emulator launch script if set
-            if (preEmulatorLaunchScripts !== undefined) {
-                console.log(`::group::Run pre emulator launch script`);
+async function run() {
+    let port = input_validator_1.MIN_PORT;
+    try {
+        console.log(`::group::Configure emulator`);
+        let linuxSupportKVM = false;
+        // only support running on macOS or Linux
+        if (process.platform !== 'darwin') {
+            if (process.platform === 'linux') {
                try {
-                    for (const preEmulatorLaunchScript of preEmulatorLaunchScripts) {
-                        // use array form to avoid various quote escaping problems
-                        // caused by exec(`sh -c "${preEmulatorLaunchScript}"`)
-                        yield exec.exec('sh', ['-c', preEmulatorLaunchScript], {
-                            cwd: workingDirectory,
-                        });
-                    }
+                    (0, fs_1.accessSync)('/dev/kvm', fs_1.constants.R_OK | fs_1.constants.W_OK);
+                    linuxSupportKVM = true;
                }
-                catch (error) {
-                    core.setFailed(error instanceof Error ? error.message : error);
+                catch {
+                    console.warn(`You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`);
                }
-                console.log(`::endgroup::`);
            }
-            // launch an emulator
-            yield (0, emulator_manager_1.launchEmulator)(avdName, disableAnimations, disableLinuxHardwareAcceleration, disableSpellchecker, emulatorBootTimeout, emulatorOptions, enableHardwareKeyboard, port);
-            // execute the custom script
+            else {
+                throw new Error('Unsupported virtual machine: please use either macos or ubuntu VM.');
+            }
+        }
+        // API level of the platform and system image
+        const apiLevel = core.getInput('api-level', { required: true });
+        console.log(`API level: ${apiLevel}`);
+        let systemImageApiLevel = core.getInput('system-image-api-level');
+        if (!systemImageApiLevel) {
+            systemImageApiLevel = apiLevel;
+        }
+        console.log(`System image API level: ${systemImageApiLevel}`);
+        // target of the system image
+        const target = (0, input_validator_1.playstoreTargetSubstitution)(core.getInput('target'));
+        console.log(`target: ${target}`);
+        // CPU architecture of the system image
+        const arch = core.getInput('arch');
+        (0, input_validator_1.checkArch)(arch);
+        console.log(`CPU architecture: ${arch}`);
+        // Hardware profile used for creating the AVD
+        const profile = core.getInput('profile');
+        console.log(`Hardware profile: ${profile}`);
+        // Number of cores to use for emulator
+        const cores = core.getInput('cores');
+        console.log(`Cores: ${cores}`);
+        // RAM to use for AVD
+        const ramSize = core.getInput('ram-size');
+        console.log(`RAM size: ${ramSize}`);
+        // Heap size to use for AVD
+        const heapSize = core.getInput('heap-size');
+        console.log(`Heap size: ${heapSize}`);
+        // SD card path or size used for creating the AVD
+        const sdcardPathOrSize = core.getInput('sdcard-path-or-size');
+        console.log(`SD card path or size: ${sdcardPathOrSize}`);
+        const diskSize = core.getInput('disk-size');
+        (0, input_validator_1.checkDiskSize)(diskSize);
+        console.log(`Disk size: ${diskSize}`);
+        // custom name used for creating the AVD
+        const avdName = core.getInput('avd-name');
+        console.log(`AVD name: ${avdName}`);
+        // force AVD creation
+        const forceAvdCreationInput = core.getInput('force-avd-creation');
+        (0, input_validator_1.checkForceAvdCreation)(forceAvdCreationInput);
+        const forceAvdCreation = forceAvdCreationInput === 'true';
+        console.log(`force avd creation: ${forceAvdCreation}`);
+        // Emulator boot timeout seconds
+        const emulatorBootTimeout = parseInt(core.getInput('emulator-boot-timeout'), 10);
+        console.log(`Emulator boot timeout: ${emulatorBootTimeout}`);
+        // Emulator port to use
+        port = parseInt(core.getInput('emulator-port'), 10);
+        (0, input_validator_1.checkPort)(port);
+        console.log(`emulator port: ${port}`);
+        // emulator options
+        const emulatorOptions = core.getInput('emulator-options').trim();
+        console.log(`emulator options: ${emulatorOptions}`);
+        // disable animations
+        const disableAnimationsInput = core.getInput('disable-animations');
+        (0, input_validator_1.checkDisableAnimations)(disableAnimationsInput);
+        const disableAnimations = disableAnimationsInput === 'true';
+        console.log(`disable animations: ${disableAnimations}`);
+        // disable spellchecker
+        const disableSpellcheckerInput = core.getInput('disable-spellchecker');
+        (0, input_validator_1.checkDisableSpellchecker)(disableSpellcheckerInput);
+        const disableSpellchecker = disableSpellcheckerInput === 'true';
+        console.log(`disable spellchecker: ${disableSpellchecker}`);
+        // disable linux hardware acceleration
+        let disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel');
+        (0, input_validator_1.checkDisableLinuxHardwareAcceleration)(disableLinuxHardwareAccelerationInput);
+        if (disableLinuxHardwareAccelerationInput === 'auto' && process.platform === 'linux') {
+            disableLinuxHardwareAccelerationInput = linuxSupportKVM ? 'false' : 'true';
+        }
+        const disableLinuxHardwareAcceleration = disableLinuxHardwareAccelerationInput === 'true';
+        console.log(`disable Linux hardware acceleration: ${disableLinuxHardwareAcceleration}`);
+        // enable hardware keyboard
+        const enableHardwareKeyboardInput = core.getInput('enable-hw-keyboard');
+        (0, input_validator_1.checkEnableHardwareKeyboard)(enableHardwareKeyboardInput);
+        const enableHardwareKeyboard = enableHardwareKeyboardInput === 'true';
+        console.log(`enable hardware keyboard: ${enableHardwareKeyboard}`);
+        // emulator build
+        const emulatorBuildInput = core.getInput('emulator-build');
+        if (emulatorBuildInput) {
+            (0, input_validator_1.checkEmulatorBuild)(emulatorBuildInput);
+            console.log(`using emulator build: ${emulatorBuildInput}`);
+        }
+        const emulatorBuild = !emulatorBuildInput ? undefined : emulatorBuildInput;
+        // custom working directory
+        const workingDirectoryInput = core.getInput('working-directory');
+        if (workingDirectoryInput) {
+            console.log(`custom working directory: ${workingDirectoryInput}`);
+        }
+        const workingDirectory = !workingDirectoryInput ? undefined : workingDirectoryInput;
+        // version of NDK to install
+        const ndkInput = core.getInput('ndk');
+        if (ndkInput) {
+            console.log(`version of NDK to install: ${ndkInput}`);
+        }
+        const ndkVersion = !ndkInput ? undefined : ndkInput;
+        // version of CMake to install
+        const cmakeInput = core.getInput('cmake');
+        if (cmakeInput) {
+            console.log(`version of CMake to install: ${cmakeInput}`);
+        }
+        const cmakeVersion = !cmakeInput ? undefined : cmakeInput;
+        // channelId (up to and including) to download the SDK packages from
+        const channelName = core.getInput('channel');
+        (0, input_validator_1.checkChannel)(channelName);
+        const channelId = (0, channel_id_mapper_1.getChannelId)(channelName);
+        console.log(`Channel: ${channelId} (${channelName})`);
+        // custom script to run
+        const scriptInput = core.getInput('script', { required: true });
+        const scripts = (0, script_parser_1.parseScript)(scriptInput);
+        console.log(`Script:`);
+        scripts.forEach(async (script) => {
+            console.log(`${script}`);
+        });
+        // custom pre emulator launch script
+        const preEmulatorLaunchScriptInput = core.getInput('pre-emulator-launch-script');
+        const preEmulatorLaunchScripts = !preEmulatorLaunchScriptInput ? undefined : (0, script_parser_1.parseScript)(preEmulatorLaunchScriptInput);
+        console.log(`Pre emulator launch script:`);
+        preEmulatorLaunchScripts?.forEach(async (script) => {
+            console.log(`${script}`);
+        });
+        console.log(`::endgroup::`);
+        // install SDK
+        await (0, sdk_installer_1.installAndroidSdk)(apiLevel, systemImageApiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion);
+        // create AVD
+        await (0, emulator_manager_1.createAvd)(arch, avdName, cores, diskSize, enableHardwareKeyboard, forceAvdCreation, heapSize, profile, ramSize, sdcardPathOrSize, systemImageApiLevel, target);
+        // execute pre emulator launch script if set
+        if (preEmulatorLaunchScripts !== undefined) {
+            console.log(`::group::Run pre emulator launch script`);
            try {
-                // move to custom working directory if set
-                if (workingDirectory) {
-                    process.chdir(workingDirectory);
-                }
-                for (const script of scripts) {
+                for (const preEmulatorLaunchScript of preEmulatorLaunchScripts) {
                    // use array form to avoid various quote escaping problems
-                    // caused by exec(`sh -c "${script}"`)
-                    yield exec.exec('sh', ['-c', script], {
-                        env: Object.assign(Object.assign({}, process.env), { EMULATOR_PORT: `${port}`, ANDROID_SERIAL: `emulator-${port}` }),
+                    // caused by exec(`sh -c "${preEmulatorLaunchScript}"`)
+                    await exec.exec('sh', ['-c', preEmulatorLaunchScript], {
+                        cwd: workingDirectory,
                    });
                }
            }
            catch (error) {
                core.setFailed(error instanceof Error ? error.message : error);
            }
-            // finally kill the emulator
-            yield (0, emulator_manager_1.killEmulator)(port);
+            console.log(`::endgroup::`);
+        }
+        // launch an emulator
+        await (0, emulator_manager_1.launchEmulator)(avdName, disableAnimations, disableLinuxHardwareAcceleration, disableSpellchecker, emulatorBootTimeout, emulatorOptions, enableHardwareKeyboard, port);
+        // execute the custom script
+        try {
+            // move to custom working directory if set
+            if (workingDirectory) {
+                process.chdir(workingDirectory);
+            }
+            for (const script of scripts) {
+                // use array form to avoid various quote escaping problems
+                // caused by exec(`sh -c "${script}"`)
+                await exec.exec('sh', ['-c', script], {
+                    env: { ...process.env, EMULATOR_PORT: `${port}`, ANDROID_SERIAL: `emulator-${port}` },
+                });
+            }
        }
        catch (error) {
-            // kill the emulator so the action can exit
-            yield (0, emulator_manager_1.killEmulator)(port);
            core.setFailed(error instanceof Error ? error.message : error);
        }
-    });
+        // finally kill the emulator
+        await (0, emulator_manager_1.killEmulator)(port);
+    }
+    catch (error) {
+        // kill the emulator so the action can exit
+        await (0, emulator_manager_1.killEmulator)(port);
+        core.setFailed(error instanceof Error ? error.message : error);
+    }
 }
 run();
@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseScript = void 0;
+exports.parseScript = parseScript;
 /**
 * Convert a (potentially multi-line) script to an array of single-line script(s).
 */
@@ -17,4 +17,3 @@ function parseScript(rawScript) {
    }
    return scripts;
 }
-exports.parseScript = parseScript;
@@ -15,99 +15,97 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
    o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installAndroidSdk = void 0;
+exports.installAndroidSdk = installAndroidSdk;
 const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const io = __importStar(require("@actions/io"));
 const tc = __importStar(require("@actions/tool-cache"));
 const fs = __importStar(require("fs"));
-const BUILD_TOOLS_VERSION = '35.0.0';
-// SDK command-line tools 16.0
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-12266719_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-12266719_latest.zip';
+const BUILD_TOOLS_VERSION = '36.0.0';
+// SDK command-line tools 20.0
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-14742923_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip';
 /**
 * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
 * and the system image for the chosen API level, CPU arch, and target.
 */
-function installAndroidSdk(apiLevel, systemImageApiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            console.log(`::group::Install Android SDK`);
-            const isOnMac = process.platform === 'darwin';
-            const isArm = process.arch === 'arm64';
-            const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
-            if (!fs.existsSync(cmdlineToolsPath)) {
-                console.log('Installing new cmdline-tools.');
-                const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
-                const downloadPath = yield tc.downloadTool(sdkUrl);
-                yield tc.extractZip(downloadPath, cmdlineToolsPath);
-                yield io.mv(`${cmdlineToolsPath}/cmdline-tools`, `${cmdlineToolsPath}/latest`);
-            }
-            // add paths for commandline-tools and platform-tools
-            core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
-            // set standard AVD path
-            yield io.mkdirP(`${process.env.HOME}/.android/avd`);
-            core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
-            // accept all Android SDK licenses
-            yield exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);
-            console.log('Installing latest build tools, platform tools, and platform.');
-            yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}'> /dev/null"`);
-            console.log('Installing latest emulator.');
-            yield exec.exec(`sh -c \\"sdkmanager --install emulator --channel=${channelId} > /dev/null"`);
-            if (emulatorBuild) {
-                console.log(`Installing emulator build ${emulatorBuild}.`);
-                // TODO find out the correct download URLs for all build ids
-                var downloadUrlSuffix;
-                const majorBuildVersion = Number(emulatorBuild);
-                if (majorBuildVersion >= 8000000) {
-                    if (isArm) {
-                        downloadUrlSuffix = `_aarch64-${emulatorBuild}`;
-                    }
-                    else {
-                        downloadUrlSuffix = `_x64-${emulatorBuild}`;
-                    }
-                }
-                else if (majorBuildVersion >= 7000000) {
-                    downloadUrlSuffix = `_x64-${emulatorBuild}`;
+async function installAndroidSdk(apiLevel, systemImageApiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion) {
+    try {
+        console.log(`::group::Install Android SDK`);
+        const isOnMac = process.platform === 'darwin';
+        const isArm = process.arch === 'arm64';
+        const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
+        if (!fs.existsSync(cmdlineToolsPath)) {
+            console.log('Installing new cmdline-tools.');
+            const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
+            const downloadPath = await tc.downloadTool(sdkUrl);
+            await tc.extractZip(downloadPath, cmdlineToolsPath);
+            await io.mv(`${cmdlineToolsPath}/cmdline-tools`, `${cmdlineToolsPath}/latest`);
+        }
+        // add paths for commandline-tools and platform-tools
+        core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
+        // set standard AVD path
+        await io.mkdirP(`${process.env.HOME}/.android/avd`);
+        core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`);
+        // accept all Android SDK licenses
+        await exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);
+        console.log('Installing latest build tools, platform tools, and platform.');
+        await exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}'> /dev/null"`);
+        console.log('Installing latest emulator.');
+        await exec.exec(`sh -c \\"sdkmanager --install emulator --channel=${channelId} > /dev/null"`);
+        if (emulatorBuild) {
+            console.log(`Installing emulator build ${emulatorBuild}.`);
+            // TODO find out the correct download URLs for all build ids
+            var downloadUrlSuffix;
+            const majorBuildVersion = Number(emulatorBuild);
+            if (majorBuildVersion >= 8000000) {
+                if (isArm) {
+                    downloadUrlSuffix = `_aarch64-${emulatorBuild}`;
                }
                else {
-                    downloadUrlSuffix = `-${emulatorBuild}`;
+                    downloadUrlSuffix = `_x64-${emulatorBuild}`;
                }
-                yield exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}${downloadUrlSuffix}.zip`);
-                yield exec.exec(`unzip -o -q emulator.zip -d ${process.env.ANDROID_HOME}`);
-                yield io.rmRF('emulator.zip');
            }
-            console.log('Installing system images.');
-            yield exec.exec(`sh -c \\"sdkmanager --install 'system-images;android-${systemImageApiLevel};${target};${arch}' --channel=${channelId} > /dev/null"`);
-            if (ndkVersion) {
-                console.log(`Installing NDK ${ndkVersion}.`);
-                yield exec.exec(`sh -c \\"sdkmanager --install 'ndk;${ndkVersion}' --channel=${channelId} > /dev/null"`);
+            else if (majorBuildVersion >= 7000000) {
+                downloadUrlSuffix = `_x64-${emulatorBuild}`;
            }
-            if (cmakeVersion) {
-                console.log(`Installing CMake ${cmakeVersion}.`);
-                yield exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' --channel=${channelId} > /dev/null"`);
+            else {
+                downloadUrlSuffix = `-${emulatorBuild}`;
            }
+            await exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}${downloadUrlSuffix}.zip`);
+            await exec.exec(`unzip -o -q emulator.zip -d ${process.env.ANDROID_HOME}`);
+            await io.rmRF('emulator.zip');
        }
-        finally {
-            console.log(`::endgroup::`);
+        console.log('Installing system images.');
+        await exec.exec(`sh -c \\"sdkmanager --install 'system-images;android-${systemImageApiLevel};${target};${arch}' --channel=${channelId} > /dev/null"`);
+        if (ndkVersion) {
+            console.log(`Installing NDK ${ndkVersion}.`);
+            await exec.exec(`sh -c \\"sdkmanager --install 'ndk;${ndkVersion}' --channel=${channelId} > /dev/null"`);
        }
-    });
+        if (cmakeVersion) {
+            console.log(`Installing CMake ${cmakeVersion}.`);
+            await exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' --channel=${channelId} > /dev/null"`);
+        }
+    }
+    finally {
+        console.log(`::endgroup::`);
+    }
 }
-exports.installAndroidSdk = installAndroidSdk;
@@ -19,7 +19,7 @@
    "setup"
  ],
  "engines": {
-    "node": ">=20"
+    "node": ">=24"
  },
  "author": "Reactive Circus",
  "license": "MIT",
@@ -31,18 +31,18 @@
    "set-value": "^4.1.0"
  },
  "devDependencies": {
-    "@types/jest": "^29.2.0",
-    "@types/node": "^20.11.0",
-    "@typescript-eslint/eslint-plugin": "^5.41.0",
-    "@typescript-eslint/parser": "^5.41.0",
-    "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.2.2",
-    "jest-circus": "^29.2.2",
-    "prettier": "^2.7.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.8.4"
+    "@types/jest": "^29.5.12",
+    "@types/node": "^24.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "jest": "^29.7.0",
+    "jest-circus": "^29.7.0",
+    "prettier": "^3.3.3",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.5.4"
  }
 }
@@ -16,7 +16,7 @@ export async function createAvd(
  ramSize: string,
  sdcardPathOrSize: string,
  systemImageApiLevel: string,
-  target: string
+  target: string,
 ): Promise<void> {
  try {
    console.log(`::group::Create AVD`);
@@ -27,7 +27,7 @@ export async function createAvd(
      const sdcardPathOrSizeOption = sdcardPathOrSize.trim() !== '' ? `--sdcard '${sdcardPathOrSize}'` : '';
      console.log(`Creating AVD.`);
      await exec.exec(
-        `sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`
+        `sh -c \\"echo no | avdmanager create avd --force -n "${avdName}" --package 'system-images;android-${systemImageApiLevel};${target};${arch}' ${profileOption} ${sdcardPathOrSizeOption}"`,
      );
    }

@@ -71,7 +71,7 @@ export async function launchEmulator(
  emulatorBootTimeout: number,
  emulatorOptions: string,
  enableHardwareKeyboard: boolean,
-  port: number
+  port: number,
 ): Promise<void> {
  try {
    console.log(`::group::Launch Emulator`);
@@ -33,7 +33,7 @@ async function run() {
          linuxSupportKVM = true;
        } catch {
          console.warn(
-            `You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`
+            `You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`,
          );
        }
      } else {
@@ -4,10 +4,10 @@ import * as io from '@actions/io';
 import * as tc from '@actions/tool-cache';
 import * as fs from 'fs';

-const BUILD_TOOLS_VERSION = '35.0.0';
-// SDK command-line tools 16.0
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-12266719_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-12266719_latest.zip';
+const BUILD_TOOLS_VERSION = '36.0.0';
+// SDK command-line tools 20.0
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-14742923_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip';

 /**
 * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
@@ -21,7 +21,7 @@ export async function installAndroidSdk(
  channelId: number,
  emulatorBuild?: string,
  ndkVersion?: string,
-  cmakeVersion?: string
+  cmakeVersion?: string,
 ): Promise<void> {
  try {
    console.log(`::group::Install Android SDK`);
@@ -1,36 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-android {
-    namespace = "com.example.testapp"
-
-    compileSdkVersion 35
-    buildToolsVersion "35.0.0"
-
-    defaultConfig {
-        applicationId "com.example.testapp"
-        minSdkVersion 21
-        targetSdkVersion 35
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    compilerOptions {
-        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
-    }
-}
-
-dependencies {
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-}
@@ -0,0 +1,36 @@
+plugins {
+    id("com.android.application")
+}
+
+android {
+    namespace = "com.example.testapp"
+    compileSdk = 36
+    buildToolsVersion = "36.0.0"
+
+    defaultConfig {
+        applicationId = "com.example.testapp"
+        minSdk = 23
+        targetSdk = 36
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+    }
+}
+
+dependencies {
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    androidTestImplementation("androidx.test.ext:junit:1.3.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+}
@@ -1,26 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.application") version "9.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.3.10" apply false
+}
+
@@ -5,5 +5,3 @@ org.gradle.caching=true
 # Kotlin code style
 kotlin.code.style=official

-# Enable AndroidX
-android.useAndroidX=true
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

    JAVACMD=$( cygpath --unix "$JAVACMD" )

@@ -203,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

 # Stop when "xargs" is not available.
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
@@ -1,2 +0,0 @@
-rootProject.name='Test Project'
-include ':app'
@@ -0,0 +1,28 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("androidx.*")
+                includeGroupByRegex("com.android.*")
+                includeGroupByRegex("com.google.*")
+            }
+        }
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Test Project"
+include(":app")
+
+dependencyResolutionManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("androidx.*")
+                includeGroupByRegex("com.android.*")
+                includeGroupByRegex("com.google.*")
+            }
+        }
+        mavenCentral()
+    }
+}
@@ -2,7 +2,7 @@
  "compilerOptions": {
    /* Basic Options */
    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "es2022",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
    // "allowJs": true,                       /* Allow javascript files to be compiled. */
    // "checkJs": true,                       /* Report errors in .js files. */
@@ -45,7 +45,8 @@
    // "typeRoots": [],                       /* List of folders to include type definitions from. */
    // "types": [],                           /* Type declaration files to be included in compilation. */
    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "skipLibCheck": true
    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */