From 7f22785663f2c5204a1304dc847eb73a8570a55c Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 6 Jan 2021 23:10:03 +1100 Subject: [PATCH 1/5] Add LeakCanary to adopter list --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 830c348f7..8bcfb9d79 100644 --- a/README.md +++ b/README.md @@ -115,24 +115,25 @@ 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) 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. From 4281471e5b6b11b5f0dc55b1ae2e19d7d0f37a52 Mon Sep 17 00:00:00 2001 From: fartem Date: Sat, 9 Jan 2021 00:17:11 +0300 Subject: [PATCH 2/5] Add Hash Checker app projects to consumers list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8bcfb9d79..4158771cb 100644 --- a/README.md +++ b/README.md @@ -135,5 +135,7 @@ These are some of the open-source projects using (or used) **Android Emulator Ru - [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. From efc0dae5fac80f7be0061871c793dacff21aa73c Mon Sep 17 00:00:00 2001 From: Yang Date: Sat, 9 Jan 2021 12:41:16 +1100 Subject: [PATCH 3/5] Gradle 6.8. --- test-fixture/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties index 2a4866da0..8721ba4f1 100644 --- 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 From 205fbe1b318941d3705cdfdc9fb368de9ba63ca3 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 13 Jan 2021 15:47:58 +1100 Subject: [PATCH 4/5] Always add path for cmdline-tools to support macos-11.0. --- .github/workflows/workflow.yml | 2 +- lib/sdk-installer.js | 4 ++-- src/sdk-installer.ts | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 00e497187..a677231f3 100644 --- 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/lib/sdk-installer.js b/lib/sdk-installer.js index ecaeec09a..746438fba 100644 --- 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 index ca1d36c31..d00c229de 100644 --- 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)) { From 91b2b2f06f5609ac891774a9ab27cf315e145680 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 13 Jan 2021 19:28:11 +1100 Subject: [PATCH 5/5] Prepare for release 2.14.3. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f560cf1..db5c9ae75 100644 --- 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).