Merge branch 'master' into release/v2

* master:
  Prepare for release 2.6.2.
  Add gradle caching.
  Use correct cli-tools binary for mac.
  Remove API 28 from workflow.

Author: ychescale9

.github/workflows/workflow.yml

@@ -14,14 +14,12 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        api-level: [16, 23, 28, 29]
+        api-level: [16, 23, 29]
         exclude:
           - os: ubuntu-latest
             api-level: 23
           - os: ubuntu-latest
             api-level: 29
-          - os: macos-latest
-            api-level: 28
     steps:
     - name: checkout
       uses: actions/checkout@v2
@@ -40,7 +38,13 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 14
-
+    - name: Clean cache
+      if: matrix.os == 'macos-latest'
+      run: mv ~/.gradle/caches ~/.gradle/.invalid_caches
+    - uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
     - name: run action
       uses: ./
       with:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.6.2
+
+* Fixed an issue where the Linux command-line tools binary is used for `macos`.
+
 ## v2.6.1
 
 * Fixed SDK license issue on Linux when downloading API 28+ system images - [#42](https://github.com/ReactiveCircus/android-emulator-runner/issues/42).

lib/sdk-installer.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_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,

src/sdk-installer.ts

@@ -2,7 +2,7 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 
 const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
 
 /**