Merge branch 'main' into release/v2

* main:
  Prepare for release 2.13.0.
  Update cmdline-tools to 3.0.
  Update npm packages.
  Add Shopify/android-testify to list of projects

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.13.0
+
+* Updated to SDK command-line tools `3.0`.
+
 ## v2.12.0
 
 Added support for using the `playstore` system images:

README.md

@@ -132,5 +132,6 @@ These are some of the open-source projects using (or used) **Android Emulator Ru
 - [simpledotorg/simple-android](https://github.com/simpledotorg/simple-android)
 - [cashapp/copper](https://github.com/cashapp/copper/blob/trunk/.github/workflows/build.yaml)
 - [square/radiography](https://github.com/square/radiography/blob/main/.github/workflows/android.yml)
+- [Shopify/android-testify](https://github.com/Shopify/android-testify/blob/master/.github/workflows/sample_build.yml)
 
 If you are using **Android Emulator Runner** and want your project included in the list, please feel free to create an issue or open a pull request.

lib/sdk-installer.js

@@ -32,10 +32,11 @@ exports.installAndroidSdk = void 0;
 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 = '30.0.2';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6609375_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6858069_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6858069_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.
@@ -50,12 +51,11 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm
         if (!fs.existsSync(cmdlineToolsPath)) {
             console.log('Installing new cmdline-tools.');
             const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
-            yield io.mkdirP(`${process.env.ANDROID_HOME}/cmdline-tools`);
-            yield exec.exec(`curl -fo commandlinetools.zip ${sdkUrl}`);
-            yield exec.exec(`unzip -q commandlinetools.zip -d ${cmdlineToolsPath}`);
-            yield io.rmRF('commandlinetools.zip');
+            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}/tools:${cmdlineToolsPath}/tools/bin:${process.env.ANDROID_HOME}/platform-tools`);
+            core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`);
         }
         // additional permission and license requirements for Linux
         const sdkPreviewLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license`;