diff --git a/action.yml b/action.yml index a8e4c36..6d796b9 100644 --- a/action.yml +++ b/action.yml @@ -6,7 +6,7 @@ inputs: cmdline-tools-version: description: 'cmdline-tools-version. See https://developer.android.com/studio#command-line-tools-only' required: false - default: '14742923' + default: '15859902' accept-android-sdk-licenses: description: 'Android SDK is usable only after the license agreement. Should setup-android agree to the licences, provided by "sdkmanager --licenses"' diff --git a/dist/index.js b/dist/index.js index e35c07c..0f59a5f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -23152,6 +23152,8 @@ var fs4 = __toESM(require("fs")); var os6 = __toESM(require("os")); function getVersionShort(versionLong) { switch (versionLong) { + case "15859902": + return "22.0"; case "14742923": return "20.0"; case "12266719": @@ -23184,6 +23186,7 @@ if (VERSION_LONG.includes("/") || VERSION_LONG.includes("\\")) { var VERSION_SHORT = getVersionShort(VERSION_LONG); var COMMANDLINE_TOOLS_WIN_URL = `https://dl.google.com/android/repository/commandlinetools-win-${VERSION_LONG}_latest.zip`; var COMMANDLINE_TOOLS_MAC_URL = `https://dl.google.com/android/repository/commandlinetools-mac-${VERSION_LONG}_latest.zip`; +var COMMANDLINE_TOOLS_MAC_ARM64_URL = `https://dl.google.com/android/repository/commandlinetools-mac_arm64-${VERSION_LONG}_latest.zip`; var COMMANDLINE_TOOLS_LIN_URL = `https://dl.google.com/android/repository/commandlinetools-linux-${VERSION_LONG}_latest.zip`; var ANDROID_HOME_SDK_DIR = path6.join(os6.homedir(), ".android", "sdk"); var ANDROID_SDK_ROOT = process.env["ANDROID_SDK_ROOT"] || ANDROID_HOME_SDK_DIR; @@ -23218,7 +23221,11 @@ async function installSdkManager() { if (process.platform === "linux") { cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL; } else if (process.platform === "darwin") { - cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_URL; + if (Number(VERSION_LONG) >= 15859902) { + cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_ARM64_URL; + } else { + cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_URL; + } } else if (process.platform === "win32") { cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL; } else { diff --git a/src/main.ts b/src/main.ts index 7fdd87d..eb50f1b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,6 +7,8 @@ import * as os from 'os' function getVersionShort(versionLong: string): string { switch (versionLong) { + case '15859902': + return '22.0' case '14742923': return '20.0' case '12266719': @@ -41,6 +43,7 @@ const VERSION_SHORT = getVersionShort(VERSION_LONG) const COMMANDLINE_TOOLS_WIN_URL = `https://dl.google.com/android/repository/commandlinetools-win-${VERSION_LONG}_latest.zip` const COMMANDLINE_TOOLS_MAC_URL = `https://dl.google.com/android/repository/commandlinetools-mac-${VERSION_LONG}_latest.zip` +const COMMANDLINE_TOOLS_MAC_ARM64_URL = `https://dl.google.com/android/repository/commandlinetools-mac_arm64-${VERSION_LONG}_latest.zip` const COMMANDLINE_TOOLS_LIN_URL = `https://dl.google.com/android/repository/commandlinetools-linux-${VERSION_LONG}_latest.zip` const ANDROID_HOME_SDK_DIR = path.join(os.homedir(), '.android', 'sdk') @@ -105,7 +108,11 @@ async function installSdkManager(): Promise { if (process.platform === 'linux') { cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL } else if (process.platform === 'darwin') { - cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_URL + if (Number(VERSION_LONG) >= 15859902) { + cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_ARM64_URL + } else { + cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_URL + } } else if (process.platform === 'win32') { cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL } else {