Merge branch 'main' into release/v2

* main:
  Prepare for release 2.24.0.
  Add option to specify AVD heap size (#245)
  Gradle 7.4.2.
  Bump GH actions (#240)
  Bump minimist from 1.2.5 to 1.2.6 (#237)
  Update dependencies in test-fixture.
  Add more .gitignore rules (#231)
  Update README for using with gradle/gradle-build-action (#230)

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: validate gradle wrapper
       uses: gradle/wrapper-validation-action@v1
@@ -61,10 +61,11 @@ jobs:
         npm test
 
     - name: Java 15
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'zulu'
         java-version: 15
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       id: avd-cache
       with:
         path: |

.github/workflows/manually.yml

@@ -39,7 +39,7 @@ jobs:
     
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: validate gradle wrapper
       uses: gradle/wrapper-validation-action@v1
@@ -52,10 +52,11 @@ jobs:
         npm test
 
     - name: Java 15
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'zulu'
         java-version: 15
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.gradle/caches

.gitignore

@@ -91,3 +91,13 @@ typings/
 
 # DynamoDB Local files
 .dynamodb/
+
+# Mac
+.DS_Store
+
+# Vscode
+.vscode
+
+# IntelliJ IDEA
+.idea
+*.iml

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## v2.24.0
+
+* Add option to specify `heap-size` for the AVD. - [#245](https://github.com/ReactiveCircus/android-emulator-runner/pull/245) @timusus.
+
+## v2.23.0
+
+* Update build tools to `32.0.0`. - [#212](https://github.com/ReactiveCircus/android-emulator-runner/pull/212)
+* Update SDK command-line tools to `6.0`. - [#213](https://github.com/ReactiveCircus/android-emulator-runner/pull/213)
+* Add option to specify `disk-size` for the AVD. - [#219](https://github.com/ReactiveCircus/android-emulator-runner/pull/219) @ViliusSutkus89.
+* Improve logging by grouping log lines. - [#224](https://github.com/ReactiveCircus/android-emulator-runner/pull/224) @michaelkaye.
+
 ## v2.22.0
 
 * Add option to enable hardware keyboard. - [#209](https://github.com/ReactiveCircus/android-emulator-runner/pull/209) (upstreamed from the [Doist fork](https://github.com/Doist/android-emulator-runner/commit/4b6ca99f0d657662beca3eb0c22d8e254fbd5b31)).

README.md

@@ -26,13 +26,13 @@ It is recommended to run this action on a **macOS** VM, e.g. `macos-latest`, `ma
 
 A workflow that uses **android-emulator-runner** to run your instrumented tests on **API 29**:
 
-```
+```yml
 jobs:
   test:
     runs-on: macos-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -43,7 +43,7 @@ jobs:
 
 We can also leverage GitHub Actions's build matrix to test across multiple configurations:
 
-```
+```yml
 jobs:
   test:
     runs-on: macos-latest
@@ -53,7 +53,7 @@ jobs:
         target: [default, google_apis]
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -67,13 +67,13 @@ jobs:
 
 If you need specific versions of **NDK** and **CMake** installed:
 
-```
+```yml
 jobs:
   test:
     runs-on: macos-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -86,11 +86,12 @@ jobs:
 
 We can significantly reduce emulator startup time by setting up AVD snapshot caching:
 
-1. add an `actions/cache@v2` step for caching the `avd`
+1. add a `gradle/gradle-build-action@v2` step for caching Gradle, more details see [#229](https://github.com/ReactiveCircus/android-emulator-runner/issues/229)
-2. add a `reactivecircus/android-emulator-runner@v2` step to generate a clean snapshot - specify `emulator-options` without `no-snapshot`
+2. add an `actions/cache@v3` step for caching the `avd`
-3. add another `reactivecircus/android-emulator-runner@v2` step to run your tests using existing AVD / snapshot - specify `emulator-options` with `no-snapshot-save`
+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`
 
-```
+```yml
 jobs:
   test:
     runs-on: macos-latest
@@ -99,18 +100,13 @@ jobs:
         api-level: [21, 23, 29]
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Gradle cache
-        uses: actions/cache@v2
+        uses: gradle/gradle-build-action@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
         
       - name: AVD cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: avd-cache
         with:
           path: |
@@ -148,7 +144,9 @@ jobs:
 | `profile` | Optional | N/A | Hardware profile used for creating the AVD - e.g. `Nexus 6`. For a list of all profiles available, run `avdmanager list device`. |
 | `cores` | Optional | 2 | Number of cores to use for the emulator (`hw.cpu.ncore` in config.ini). |
 | `ram-size` | Optional | N/A | Size of RAM to use for this AVD, in KB or MB, denoted with K or M. - e.g. `2048M` |
+| `heap-size` | Optional | N/A | Heap size to use for this AVD, in KB or MB, denoted with K or M. - e.g. `512M` |
 | `sdcard-path-or-size` | Optional | N/A | Path to the SD card image for this AVD or the size of a new SD card image to create for this AVD, in KB or MB, denoted with K or M. - e.g. `path/to/sdcard`, or `1000M`. |
+| `disk-size` | Optional | N/A | Disk size to use for this AVD. Either in bytes or KB, MB or GB, when denoted with K, M or G. - e.g. `2048M` |
 | `avd-name` | Optional | `test` | Custom AVD name used for creating the Android Virtual Device. |
 | `force-avd-creation` | Optional | `true` | Whether to force create the AVD by overwriting an existing AVD with the same name as `avd-name` - `true` or `false`. |
 | `emulator-options` | Optional | See below | Command-line options used when launching the emulator (replacing all default options) - e.g. `-no-window -no-snapshot -camera-back emulated`. |
@@ -199,7 +197,7 @@ These are some of the open-source projects using (or used) **Android Emulator Ru
 - [hash-checker/hash-checker](https://github.com/hash-checker/hash-checker/tree/master/.github/workflows)
 - [hash-checker/hash-checker-lite](https://github.com/hash-checker/hash-checker-lite/tree/master/.github/workflows)
 - [Kiwix/kiwix-android](https://github.com/kiwix/kiwix-android/blob/develop/.github/workflows)
-- [wikimedia/apps-android-wikipedia](https://github.com/wikimedia/apps-android-wikipedia/blob/master/.github/workflows)
+- [wikimedia/apps-android-wikipedia](https://github.com/wikimedia/apps-android-wikipedia/blob/main/.github/workflows)
 - [google/android-fhir](https://github.com/google/android-fhir/tree/master/.github/workflows)
 - [google/accompanist](https://github.com/google/accompanist/blob/main/.github/workflows)
 - [dotanuki-labs/norris](https://github.com/dotanuki-labs/norris/blob/master/.github/workflows/main.yml)

__tests__/input-validator.test.ts

@@ -270,3 +270,54 @@ describe('emulator-build validator tests', () => {
     expect(func).not.toThrow();
   });
 });
+
+describe('checkDiskSize validator tests', () => {
+  it('Empty size is acceptable, means default', () => {
+    const func = () => {
+      validator.checkDiskSize('');
+    };
+    expect(func).not.toThrow();
+  });
+
+  it('Numbers means bytes', () => {
+    expect(() => {
+      validator.checkDiskSize('8000000000');
+    }).not.toThrow();
+  });
+
+  it('Uppercase size modifier', () => {
+    expect(() => {
+      validator.checkDiskSize('8000000K');
+    }).not.toThrow();
+    expect(() => {
+      validator.checkDiskSize('8000M');
+    }).not.toThrow();
+    expect(() => {
+      validator.checkDiskSize('8G');
+    }).not.toThrow();
+  });
+
+  it('Lowercase size modifier', () => {
+    expect(() => {
+      validator.checkDiskSize('8000000k');
+    }).not.toThrow();
+    expect(() => {
+      validator.checkDiskSize('8000m');
+    }).not.toThrow();
+    expect(() => {
+      validator.checkDiskSize('8g');
+    }).not.toThrow();
+  });
+
+  it('Modifier without a number is unacceptable', () => {
+    expect(() => {
+      validator.checkDiskSize('G');
+    }).toThrowError(`Unexpected disk size: 'G'.`);
+  });
+
+  it('Double modifier is unacceptable', () => {
+    expect(() => {
+      validator.checkDiskSize('14gg');
+    }).toThrowError(`Unexpected disk size: '14gg'.`);
+  });
+});

action.yml

@@ -21,8 +21,12 @@ inputs:
     default: 2
   ram-size:
     description: 'size of RAM to use for this AVD, in KB or MB, denoted with K or M. - e.g. `2048M`'
+  heap-size:
+    description: 'size of heap to use for this AVD in MB. - e.g. `512M`'
   sdcard-path-or-size:
     description: 'path to the SD card image for this AVD or the size of a new SD card image to create for this AVD, in KB or MB, denoted with K or M. - e.g. `path/to/sdcard`, or `1000M`'
+  disk-size:
+    description: 'disk size to use for this AVD. Either in bytes or KB, MB or GB, when denoted with K, M or G'
   avd-name:
     description: 'custom AVD name used for creating the Android Virtual Device'
     default: 'test'

lib/emulator-manager.js

@@ -35,8 +35,10 @@ const EMULATOR_BOOT_TIMEOUT_SECONDS = 600;
 /**
  * Creates and launches a new AVD instance with the specified configurations.
  */
-function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, sdcardPathOrSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellChecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard) {
+function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellChecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard) {
     return __awaiter(this, void 0, void 0, function* () {
+        try {
+            console.log(`::group::Launch Emulator`);
             // 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) {
@@ -51,9 +53,15 @@ function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, sdcardP
             if (ramSize) {
                 yield exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
             }
+            if (heapSize) {
+                yield exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+            }
             if (enableHardwareKeyboard) {
                 yield exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
             }
+            if (diskSize) {
+                yield exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+            }
             //turn off hardware acceleration on Linux
             if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {
                 console.log('Disabling Linux hardware acceleration.');
@@ -85,6 +93,10 @@ function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, sdcardP
             if (enableHardwareKeyboard) {
                 yield exec.exec(`adb shell settings put secure show_ime_with_hard_keyboard 0`);
             }
+        }
+        finally {
+            console.log(`::endgroup::`);
+        }
     });
 }
 exports.launchEmulator = launchEmulator;
@@ -94,11 +106,15 @@ exports.launchEmulator = launchEmulator;
 function killEmulator() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            console.log(`::group::Terminate Emulator`);
             yield exec.exec(`adb -s emulator-5554 emu kill`);
         }
         catch (error) {
             console.log(error.message);
         }
+        finally {
+            console.log(`::endgroup::`);
+        }
     });
 }
 exports.killEmulator = killEmulator;

lib/input-validator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.checkTarget = exports.checkApiLevel = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.VALID_TARGETS = exports.MIN_API_LEVEL = void 0;
+exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.checkTarget = exports.checkApiLevel = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.VALID_TARGETS = exports.MIN_API_LEVEL = void 0;
 exports.MIN_API_LEVEL = 15;
 exports.VALID_TARGETS = ['default', 'google_apis', 'aosp_atd', 'google_atd', 'google_apis_playstore', 'android-wear', 'android-wear-cn', 'android-tv', 'google-tv'];
 exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a'];
@@ -71,3 +71,20 @@ exports.checkEmulatorBuild = checkEmulatorBuild;
 function isValidBoolean(value) {
     return value === 'true' || value === 'false';
 }
+function checkDiskSize(diskSize) {
+    // Disk size can be empty - the default value
+    if (diskSize) {
+        // Can also be number of bytes
+        if (isNaN(Number(diskSize)) || !Number.isInteger(Number(diskSize))) {
+            // Disk size can have a size multiplier at the end K, M or G
+            const diskSizeUpperCase = diskSize.toUpperCase();
+            if (diskSizeUpperCase.endsWith('K') || diskSizeUpperCase.endsWith('M') || diskSizeUpperCase.endsWith('G')) {
+                const diskSizeNoModifier = diskSize.slice(0, -1);
+                if (0 == diskSizeNoModifier.length || isNaN(Number(diskSizeNoModifier)) || !Number.isInteger(Number(diskSizeNoModifier))) {
+                    throw new Error(`Unexpected disk size: '${diskSize}'.`);
+                }
+            }
+        }
+    }
+}
+exports.checkDiskSize = checkDiskSize;

lib/main.js

@@ -38,6 +38,7 @@ const channel_id_mapper_1 = require("./channel-id-mapper");
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            console.log(`::group::Configure emulator`);
             // only support running on macOS or Linux
             if (process.platform !== 'darwin') {
                 if (process.platform === 'linux') {
@@ -70,9 +71,15 @@ function run() {
             // 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');
+            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}`);
@@ -141,10 +148,11 @@ function run() {
             scripts.forEach((script) => __awaiter(this, void 0, void 0, function* () {
                 console.log(`${script}`);
             }));
+            console.log(`::endgroup::`);
             // install SDK
             yield sdk_installer_1.installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion);
             // launch an emulator
-            yield emulator_manager_1.launchEmulator(apiLevel, target, arch, profile, cores, ramSize, sdcardPathOrSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellchecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard);
+            yield emulator_manager_1.launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellchecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard);
             // execute the custom script
             try {
                 // move to custom working directory if set

lib/sdk-installer.js

@@ -34,15 +34,17 @@ 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 = '31.0.0';
+const BUILD_TOOLS_VERSION = '32.0.0';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8092744_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, 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';
             if (!isOnMac) {
                 yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_SDK_ROOT} -R`);
@@ -83,6 +85,10 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
                 console.log(`Installing CMake ${cmakeVersion}.`);
                 yield exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' --channel=${channelId} > /dev/null"`);
             }
+        }
+        finally {
+            console.log(`::endgroup::`);
+        }
     });
 }
 exports.installAndroidSdk = installAndroidSdk;

node_modules/.package-lock.json

@@ -74,9 +74,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/semver": {
       "version": "6.3.0",

node_modules/minimist/index.js

@@ -70,7 +70,7 @@ module.exports = function (args, opts) {
         var o = obj;
         for (var i = 0; i < keys.length-1; i++) {
             var key = keys[i];
-            if (key === '__proto__') return;
+            if (isConstructorOrProto(o, key)) return;
             if (o[key] === undefined) o[key] = {};
             if (o[key] === Object.prototype || o[key] === Number.prototype
                 || o[key] === String.prototype) o[key] = {};
@@ -79,7 +79,7 @@ module.exports = function (args, opts) {
         }
 
         var key = keys[keys.length - 1];
-        if (key === '__proto__') return;
+        if (isConstructorOrProto(o, key)) return;
         if (o === Object.prototype || o === Number.prototype
             || o === String.prototype) o = {};
         if (o === Array.prototype) o = [];
@@ -243,3 +243,7 @@ function isNumber (x) {
     return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
 }
 
+
+function isConstructorOrProto (obj, key) {
+    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
+}

node_modules/minimist/package.json

@@ -1,67 +1,16 @@
 {
-  "_args": [
-    [
-      "minimist@1.2.5",
-      "/Users/Yang/Desktop/Projects/android-emulator-runner"
-    ]
-  ],
-  "_from": "minimist@1.2.5",
-  "_id": "minimist@1.2.5",
-  "_inBundle": false,
-  "_integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-  "_location": "/minimist",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "minimist@1.2.5",
   "name": "minimist",
-    "escapedName": "minimist",
+  "version": "1.2.6",
-    "rawSpec": "1.2.5",
-    "saveSpec": null,
-    "fetchSpec": "1.2.5"
-  },
-  "_requiredBy": [
-    "/",
-    "/@babel/core/json5",
-    "/@cnakazawa/watch",
-    "/json5",
-    "/sane"
-  ],
-  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-  "_spec": "1.2.5",
-  "_where": "/Users/Yang/Desktop/Projects/android-emulator-runner",
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/minimist/issues"
-  },
   "description": "parse argument options",
+  "main": "index.js",
   "devDependencies": {
     "covert": "^1.0.0",
     "tap": "~0.4.0",
     "tape": "^3.5.0"
   },
-  "homepage": "https://github.com/substack/minimist",
-  "keywords": [
-    "argv",
-    "getopt",
-    "parser",
-    "optimist"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "name": "minimist",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/minimist.git"
-  },
   "scripts": {
-    "coverage": "covert test/*.js",
+    "test": "tap test/*.js",
-    "test": "tap test/*.js"
+    "coverage": "covert test/*.js"
   },
   "testling": {
     "files": "test/*.js",
@@ -76,5 +25,21 @@
       "opera/12"
     ]
   },
-  "version": "1.2.5"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/minimist.git"
+  },
+  "homepage": "https://github.com/substack/minimist",
+  "keywords": [
+    "argv",
+    "getopt",
+    "parser",
+    "optimist"
+  ],
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
+  "license": "MIT"
 }

node_modules/minimist/readme.markdown

@@ -34,7 +34,10 @@ $ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar baz
 Previous versions had a prototype pollution bug that could cause privilege
 escalation in some circumstances when handling untrusted user input.
 
-Please use version 1.2.3 or later: https://snyk.io/vuln/SNYK-JS-MINIMIST-559764
+Please use version 1.2.6 or later:
+
+* https://security.snyk.io/vuln/SNYK-JS-MINIMIST-2429795 (version <=1.2.5)
+* https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 (version <=1.2.3)
 
 # methods
 

node_modules/minimist/test/proto.js

@@ -42,3 +42,19 @@ test('proto pollution (constructor)', function (t) {
     t.equal(argv.y, undefined);
     t.end();
 });
+
+test('proto pollution (constructor function)', function (t) {
+    var argv = parse(['--_.concat.constructor.prototype.y', '123']);
+    function fnToBeTested() {}
+    t.equal(fnToBeTested.y, undefined);
+    t.equal(argv.y, undefined);
+    t.end();
+});
+
+// powered by snyk - https://github.com/backstage/backstage/issues/10343
+test('proto pollution (constructor function) snyk', function (t) {
+    var argv = parse('--_.constructor.constructor.prototype.foo bar'.split(' '));
+    t.equal((function(){}).foo, undefined);
+    t.equal(argv.y, undefined);
+    t.end();
+})

package-lock.json

@@ -12,7 +12,7 @@
         "@actions/core": "^1.6.0",
         "@actions/exec": "^1.1.0",
         "@actions/tool-cache": "^1.7.1",
-        "minimist": "^1.2.5",
+        "minimist": "^1.2.6",
         "set-value": "^4.1.0"
       },
       "devDependencies": {
@@ -8508,9 +8508,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -17432,9 +17432,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mixin-deep": {
       "version": "1.3.2",

package.json

@@ -24,7 +24,7 @@
     "@actions/core": "^1.6.0",
     "@actions/exec": "^1.1.0",
     "@actions/tool-cache": "^1.7.1",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "set-value": "^4.1.0"
   },
   "devDependencies": {

src/emulator-manager.ts

@@ -13,7 +13,9 @@ export async function launchEmulator(
   profile: string,
   cores: string,
   ramSize: string,
+  heapSize: string,
   sdcardPathOrSize: string,
+  diskSize: string,
   avdName: string,
   forceAvdCreation: boolean,
   emulatorOptions: string,
@@ -22,6 +24,8 @@ export async function launchEmulator(
   disableLinuxHardwareAcceleration: boolean,
   enableHardwareKeyboard: boolean
 ): Promise<void> {
+  try {
+    console.log(`::group::Launch Emulator`);
     // 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) {
@@ -41,10 +45,18 @@ export async function launchEmulator(
       await exec.exec(`sh -c \\"printf 'hw.ramSize=${ramSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
     }
 
+    if (heapSize) {
+      await exec.exec(`sh -c \\"printf 'hw.heapSize=${heapSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+    }
+
     if (enableHardwareKeyboard) {
       await exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
     }
 
+    if (diskSize) {
+      await exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+    }
+
     //turn off hardware acceleration on Linux
     if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {
       console.log('Disabling Linux hardware acceleration.');
@@ -80,6 +92,9 @@ export async function launchEmulator(
     if (enableHardwareKeyboard) {
       await exec.exec(`adb shell settings put secure show_ime_with_hard_keyboard 0`);
     }
+  } finally {
+    console.log(`::endgroup::`);
+  }
 }
 
 /**
@@ -87,9 +102,12 @@ export async function launchEmulator(
  */
 export async function killEmulator(): Promise<void> {
   try {
+    console.log(`::group::Terminate Emulator`);
     await exec.exec(`adb -s emulator-5554 emu kill`);
   } catch (error) {
     console.log(error.message);
+  } finally {
+    console.log(`::endgroup::`);
   }
 }
 

src/input-validator.ts

@@ -69,3 +69,20 @@ export function checkEmulatorBuild(emulatorBuild: string): void {
 function isValidBoolean(value: string): boolean {
   return value === 'true' || value === 'false';
 }
+
+export function checkDiskSize(diskSize: string): void {
+  // Disk size can be empty - the default value
+  if (diskSize) {
+    // Can also be number of bytes
+    if (isNaN(Number(diskSize)) || !Number.isInteger(Number(diskSize))) {
+      // Disk size can have a size multiplier at the end K, M or G
+      const diskSizeUpperCase = diskSize.toUpperCase();
+      if (diskSizeUpperCase.endsWith('K') || diskSizeUpperCase.endsWith('M') || diskSizeUpperCase.endsWith('G')) {
+        const diskSizeNoModifier: string = diskSize.slice(0, -1);
+        if (0 == diskSizeNoModifier.length || isNaN(Number(diskSizeNoModifier)) || !Number.isInteger(Number(diskSizeNoModifier))) {
+          throw new Error(`Unexpected disk size: '${diskSize}'.`);
+        }
+      }
+    }
+  }
+}

src/main.ts

@@ -10,7 +10,8 @@ import {
   checkDisableLinuxHardwareAcceleration,
   checkForceAvdCreation,
   checkChannel,
-  checkEnableHardwareKeyboard
+  checkEnableHardwareKeyboard,
+  checkDiskSize
 } from './input-validator';
 import { launchEmulator, killEmulator } from './emulator-manager';
 import * as exec from '@actions/exec';
@@ -19,6 +20,7 @@ import { getChannelId } from './channel-id-mapper';
 
 async function run() {
   try {
+    console.log(`::group::Configure emulator`);
     // only support running on macOS or Linux
     if (process.platform !== 'darwin') {
       if (process.platform === 'linux') {
@@ -59,10 +61,18 @@ async function run() {
     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');
+    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}`);
@@ -143,6 +153,7 @@ async function run() {
     scripts.forEach(async (script: string) => {
       console.log(`${script}`);
     });
+    console.log(`::endgroup::`);
 
     // install SDK
     await installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndkVersion, cmakeVersion);
@@ -155,7 +166,9 @@ async function run() {
       profile,
       cores,
       ramSize,
+      heapSize,
       sdcardPathOrSize,
+      diskSize,
       avdName,
       forceAvdCreation,
       emulatorOptions,

src/sdk-installer.ts

@@ -4,15 +4,17 @@ import * as io from '@actions/io';
 import * as tc from '@actions/tool-cache';
 import * as fs from 'fs';
 
-const BUILD_TOOLS_VERSION = '31.0.0';
+const BUILD_TOOLS_VERSION = '32.0.0';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8092744_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.
  */
 export async function installAndroidSdk(apiLevel: number, target: string, arch: string, channelId: number, emulatorBuild?: string, ndkVersion?: string, cmakeVersion?: string): Promise<void> {
+  try {
+    console.log(`::group::Install Android SDK`);
     const isOnMac = process.platform === 'darwin';
 
     if (!isOnMac) {
@@ -63,4 +65,7 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:
       console.log(`Installing CMake ${cmakeVersion}.`);
       await exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' --channel=${channelId} > /dev/null"`);
     }
+  } finally {
+    console.log(`::endgroup::`);
+  }
 }

test-fixture/app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
-    buildToolsVersion "31.0.0"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "com.example.testapp"
         minSdkVersion 15
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
 

test-fixture/build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

test-fixture/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip