Compare commits

...

4 Commits

Author SHA1 Message Date
dependabot[bot]
8ebc2b2778 Bump jest from 30.5.1 to 30.5.2
Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 30.5.1 to 30.5.2.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.5.2/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-version: 30.5.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-09-21 16:52:40 +00:00
Vilius Sutkus '89
035682743a [CI] Add 15859902 to test matrix
(This was supposed to be added during previous commits)
2026-09-17 14:30:37 -05:00
Vilius Sutkus '89
be39fa8340 Update README.md with version 15859902 (22.0) 2026-09-17 13:37:30 -05:00
Vilius Sutkus '89
1f87d5b2a1 Add version 15859902 (22.0), default it and update macOS url for it. 2026-09-17 13:35:46 -05:00
7 changed files with 421 additions and 324 deletions

View File

@@ -66,6 +66,7 @@ jobs:
- windows-2025 - windows-2025
- windows-2022 - windows-2022
cmdline-tools-version: cmdline-tools-version:
- 15859902
- 14742923 - 14742923
- 12266719 - 12266719
- 11479570 - 11479570

View File

@@ -85,7 +85,7 @@ and `uiautomatorviewer` were dropped without one.
Command line tools are versioned using two variables - short and long. Command line tools are versioned using two variables - short and long.
Long one is the build number, used in the zip URL, short one is the human friendly version name. Long one is the build number, used in the zip URL, short one is the human friendly version name.
By default, setup-android installs version 14742923 (short version 20.0). By default, setup-android installs version 15859902 (short version 22.0).
To install a different version, call setup-android with desired long version as the input parameter `cmdline-tools-version`: To install a different version, call setup-android with desired long version as the input parameter `cmdline-tools-version`:
```yaml ```yaml
@@ -98,6 +98,7 @@ To install a different version, call setup-android with desired long version as
#### Version table #### Version table
| Short version | Long version | | Short version | Long version |
|---------------| --- | |---------------| --- |
| 22.0 | 15859902 |
| 20.0 | 14742923 | | 20.0 | 14742923 |
| 16.0 | 12266719 | | 16.0 | 12266719 |
| 13.0 | 11479570 | | 13.0 | 11479570 |

View File

@@ -6,7 +6,7 @@ inputs:
cmdline-tools-version: cmdline-tools-version:
description: 'cmdline-tools-version. See https://developer.android.com/studio#command-line-tools-only' description: 'cmdline-tools-version. See https://developer.android.com/studio#command-line-tools-only'
required: false required: false
default: '14742923' default: '15859902'
accept-android-sdk-licenses: 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"' description: 'Android SDK is usable only after the license agreement. Should setup-android agree to the licences, provided by "sdkmanager --licenses"'

9
dist/index.js vendored
View File

@@ -23152,6 +23152,8 @@ var fs4 = __toESM(require("fs"));
var os6 = __toESM(require("os")); var os6 = __toESM(require("os"));
function getVersionShort(versionLong) { function getVersionShort(versionLong) {
switch (versionLong) { switch (versionLong) {
case "15859902":
return "22.0";
case "14742923": case "14742923":
return "20.0"; return "20.0";
case "12266719": case "12266719":
@@ -23184,6 +23186,7 @@ if (VERSION_LONG.includes("/") || VERSION_LONG.includes("\\")) {
var VERSION_SHORT = getVersionShort(VERSION_LONG); 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_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_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 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_HOME_SDK_DIR = path6.join(os6.homedir(), ".android", "sdk");
var ANDROID_SDK_ROOT = process.env["ANDROID_SDK_ROOT"] || ANDROID_HOME_SDK_DIR; var ANDROID_SDK_ROOT = process.env["ANDROID_SDK_ROOT"] || ANDROID_HOME_SDK_DIR;
@@ -23218,7 +23221,11 @@ async function installSdkManager() {
if (process.platform === "linux") { if (process.platform === "linux") {
cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL; cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL;
} else if (process.platform === "darwin") { } 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") { } else if (process.platform === "win32") {
cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL; cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL;
} else { } else {

719
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -38,7 +38,7 @@
"eslint-plugin-check-file": "^3.3.2", "eslint-plugin-check-file": "^3.3.2",
"eslint-plugin-jest": "^29.16.6", "eslint-plugin-jest": "^29.16.6",
"globals": "^17.12.0", "globals": "^17.12.0",
"jest": "^30.5.1", "jest": "^30.5.2",
"jest-circus": "^30.3.0", "jest-circus": "^30.3.0",
"js-yaml": "^5.4.2", "js-yaml": "^5.4.2",
"prettier": "^3.9.7", "prettier": "^3.9.7",

View File

@@ -7,6 +7,8 @@ import * as os from 'os'
function getVersionShort(versionLong: string): string { function getVersionShort(versionLong: string): string {
switch (versionLong) { switch (versionLong) {
case '15859902':
return '22.0'
case '14742923': case '14742923':
return '20.0' return '20.0'
case '12266719': 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_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_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 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') const ANDROID_HOME_SDK_DIR = path.join(os.homedir(), '.android', 'sdk')
@@ -105,7 +108,11 @@ async function installSdkManager(): Promise<string> {
if (process.platform === 'linux') { if (process.platform === 'linux') {
cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL cmdlineToolsURL = COMMANDLINE_TOOLS_LIN_URL
} else if (process.platform === 'darwin') { } 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') { } else if (process.platform === 'win32') {
cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL cmdlineToolsURL = COMMANDLINE_TOOLS_WIN_URL
} else { } else {