From f9c2835191b86e3673ea47b69f7fe4383ecbfd6a Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 6 Dec 2023 18:25:39 +1100 Subject: [PATCH] SDK command-line tools 11.0. (#356) * SDK command-line tools 11.0. * Temporarily disable API 16 test. --- .github/workflows/main.yml | 2 +- lib/sdk-installer.js | 8 ++++---- src/sdk-installer.ts | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4542de74b..95072bd62 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest] - api-level: [16, 23, 29] + api-level: [23, 29] target: [default, google_apis] arch: [x86] exclude: diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index 49c940de0..e6fbf75cd 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -38,10 +38,10 @@ 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 = '33.0.2'; -// SDK command-line tools 9.0 -const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip'; -const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip'; +const BUILD_TOOLS_VERSION = '34.0.0'; +// SDK command-line tools 11.0 +const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip'; +const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-10406996_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. diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 9826f2589..0fd55c8bc 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -4,10 +4,10 @@ import * as io from '@actions/io'; import * as tc from '@actions/tool-cache'; import * as fs from 'fs'; -const BUILD_TOOLS_VERSION = '33.0.2'; -// SDK command-line tools 9.0 -const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip'; -const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip'; +const BUILD_TOOLS_VERSION = '34.0.0'; +// SDK command-line tools 11.0 +const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip'; +const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-10406996_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,