From 8d0ce4c94b609021dc958e5e4ecf59dfa65df2d2 Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 12 Jun 2020 17:09:06 +1000 Subject: [PATCH 1/2] =?UTF-8?q?Support=20API=2030=20system=20images=20and?= =?UTF-8?q?=20add=20API=2030=20to=20workflow.=20Update=20build=20tools=20t?= =?UTF-8?q?o=2030.0.0.=20Update=20test=20projec=E2=80=99s=20compileSdk=20a?= =?UTF-8?q?nd=20targetSdk=20to=20API=2030.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/workflow.yml | 13 ++++++++++++- lib/sdk-installer.js | 8 ++++++-- src/sdk-installer.ts | 8 ++++++-- test-fixture/app/build.gradle | 6 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f954a6ab1..a0805f1eb 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,11 +15,22 @@ jobs: matrix: os: [macos-latest, ubuntu-latest] api-level: [16, 23, 29] + target: [default, google_apis] exclude: - os: ubuntu-latest api-level: 23 - os: ubuntu-latest api-level: 29 + - target: google_apis + api-level: 16 + - target: google_apis + api-level: 23 + - target: google_apis + api-level: 29 + include: + - os: macos-latest + api-level: 30 + target: google_apis steps: - name: checkout uses: actions/checkout@v2 @@ -49,7 +60,7 @@ jobs: uses: ./ with: api-level: ${{ matrix.api-level }} - target: default + target: ${{ matrix.target }} arch: x86 profile: Nexus 6 avd-name: test diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index ef6a64647..6b1cf2361 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -17,7 +17,7 @@ var __importStar = (this && this.__importStar) || function (mod) { 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 BUILD_TOOLS_VERSION = '30.0.0'; const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip'; const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip'; /** @@ -37,9 +37,13 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm core.addPath(`${process.env.ANDROID_HOME}/cmdline-tools/tools:${process.env.ANDROID_HOME}/cmdline-tools/tools/bin:${process.env.ANDROID_HOME}/platform-tools`); // additional permission and license requirements for Linux if (!isOnMac) { - yield exec.exec(`sh -c \\"sudo chmod -R 777 ${process.env.ANDROID_HOME}"`); + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`); yield exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license"`); } + // license required for API 30 system images + if (apiLevel == 30) { + yield exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license"`); + } console.log('Installing latest build tools, platform tools, and platform.'); yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`); if (emulatorBuild) { diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index a84efa59d..19744c014 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -1,7 +1,7 @@ import * as core from '@actions/core'; import * as exec from '@actions/exec'; -const BUILD_TOOLS_VERSION = '29.0.3'; +const BUILD_TOOLS_VERSION = '30.0.0'; const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip'; const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip'; @@ -23,9 +23,13 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch: // additional permission and license requirements for Linux if (!isOnMac) { - await exec.exec(`sh -c \\"sudo chmod -R 777 ${process.env.ANDROID_HOME}"`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`); await exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license"`); } + // license required for API 30 system images + if (apiLevel == 30) { + await exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license"`); + } console.log('Installing latest build tools, platform tools, and platform.'); diff --git a/test-fixture/app/build.gradle b/test-fixture/app/build.gradle index ef2159e29..0f3d8d199 100644 --- a/test-fixture/app/build.gradle +++ b/test-fixture/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.0" defaultConfig { applicationId "com.example.testapp" minSdkVersion 15 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties index a3dbdccad..14b7f0dcb 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.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From 9ef7536c4b027e45076ba56dc63960e48b74c12b Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 12 Jun 2020 19:50:37 +1000 Subject: [PATCH 2/2] Prepare for release 2.10.0. --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaa0d1ae4..3751d72c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## v2.10.0 + +* Support Android 11 (API 30) system images. +* Bump build tools to `30.0.0`. + ## v2.9.0 * Updated to SDK command-line tools `2.0`.