Merge branch 'main' into release/v2

* main: Prepare for release 2.14.3. Always add path for cmdline-tools to support macos-11.0. Gradle 6.8. Add Hash Checker app projects to consumers list Add LeakCanary to adopter list
ReactiveCircus · Jan 13, 2021 · 08b092e · 08b092e
2 parents 94bd1ed + 91b2b2f
commit 08b092e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -30,7 +30,7 @@ jobs:
           - target: google_apis
             api-level: 29
         include:
-          - os: macos-latest
+          - os: macos-11.0
             api-level: 30
             target: google_apis
           - os: macos-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.14.3
+
+* Support `macos-11.0` (Big Sur) runner - [#124](https://github.com/ReactiveCircus/android-emulator-runner/pull/124).
+
 ## v2.14.2
 
 * Support API 28 system images with `google_apis` or `google_apis_playstore` target - [#117](https://github.com/ReactiveCircus/android-emulator-runner/pull/117).

diff --git a/README.md b/README.md
@@ -115,24 +115,27 @@ For a longer answer please refer to [this issue](https://github.com/ReactiveCirc
 
 These are some of the open-source projects using (or used) **Android Emulator Runner**:
 
-- [coil-kt/coil](https://github.com/coil-kt/coil/blob/master/.github/workflows/)
-- [cashapp/sqldelight](https://github.com/cashapp/sqldelight/blob/master/.github/workflows/)
-- [square/workflow](https://github.com/square/workflow/blob/main/.github/workflows/)
-- [square/retrofit](https://github.com/square/retrofit/blob/master/.github/workflows/)
+- [coil-kt/coil](https://github.com/coil-kt/coil/blob/master/.github/workflows)
+- [cashapp/sqldelight](https://github.com/cashapp/sqldelight/blob/master/.github/workflows)
+- [square/workflow-kotlin](https://github.com/square/workflow-kotlin/tree/main/.github/workflows)
+- [square/retrofit](https://github.com/square/retrofit/blob/master/.github/workflows)
 - [natario1/CameraView](https://github.com/natario1/CameraView/tree/master/.github/workflows)
 - [natario1/Transcoder](https://github.com/natario1/Transcoder/tree/master/.github/workflows)
 - [chrisbanes/insetter](https://github.com/chrisbanes/insetter/tree/main/.github/workflows)
 - [slackhq/keeper](https://github.com/slackhq/keeper/tree/main/.github/workflows)
 - [android/compose-samples](https://github.com/android/compose-samples/tree/main/.github/workflows)
 - [ReactiveCircus/streamlined](https://github.com/ReactiveCircus/streamlined/tree/main/.github/workflows)
-- [ReactiveCircus/FlowBinding](https://github.com/ReactiveCircus/FlowBinding)
+- [ReactiveCircus/FlowBinding](https://github.com/ReactiveCircus/FlowBinding/tree/main/.github/workflows)
 - [JakeWharton/RxBinding](https://github.com/JakeWharton/RxBinding/tree/master/.github/workflows)
-- [vinaygaba/Learn-Jetpack-Compose-By-Example](https://github.com/vinaygaba/Learn-Jetpack-Compose-By-Example/)
+- [vinaygaba/Learn-Jetpack-Compose-By-Example](https://github.com/vinaygaba/Learn-Jetpack-Compose-By-Example/tree/master/.github/workflows)
 - [ashishb/adb-enhanced](https://github.com/ashishb/adb-enhanced/tree/master/.github/workflows)
 - [vgaidarji/ci-matters](https://github.com/vgaidarji/ci-matters/blob/master/.github/workflows/main.yaml)
-- [simpledotorg/simple-android](https://github.com/simpledotorg/simple-android)
+- [simpledotorg/simple-android](https://github.com/simpledotorg/simple-android/tree/master/.github/workflows)
 - [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)
+- [square/leakcanary](https://github.com/square/leakcanary/tree/main/.github/workflows)
+- [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)
 
 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.
diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -54,9 +54,9 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm
             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_SDK_ROOT}/platform-tools`);
         }
+        // add paths for commandline-tools and platform-tools
+        core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_SDK_ROOT}/platform-tools`);
         // additional permission and license requirements for Linux
         const sdkPreviewLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-preview-license`;
         if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {

diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -26,10 +26,11 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:
     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_SDK_ROOT}/platform-tools`);
   }
 
+  // add paths for commandline-tools and platform-tools
+  core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_SDK_ROOT}/platform-tools`);
+
   // additional permission and license requirements for Linux
   const sdkPreviewLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-preview-license`;
   if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {

diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/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-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip