Compare commits

..

9 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
Vilius Sutkus '89
138b5fb1cf Update dependencies in README.md 2026-09-17 12:45:50 -05:00
Christoph Grüninger
5ed526629f README.md Update other GitHub Actions in code samples
Old versions are using deprecated Node.js version
2026-09-17 12:43:05 -05:00
Vilius Sutkus '89
ca5c9e054e Upgrade Typescript to v6. Update other deps. 2026-09-17 12:32:13 -05:00
Vilius Sutkus '89
927cbf9b1d Update npm dependencies 2026-09-17 12:00:53 -05:00
dependabot[bot]
76ffd60ae0 Bump actions/checkout from 6 to 7
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-09-17 11:55:58 -05:00
10 changed files with 4068 additions and 2944 deletions

View File

@@ -9,7 +9,7 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Setup node 24 - name: Setup node 24
uses: actions/setup-node@v6 uses: actions/setup-node@v6
@@ -26,7 +26,7 @@ jobs:
format-check: format-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Setup node 24 - name: Setup node 24
uses: actions/setup-node@v6 uses: actions/setup-node@v6
@@ -40,7 +40,7 @@ jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Setup node 24 - name: Setup node 24
uses: actions/setup-node@v6 uses: actions/setup-node@v6
@@ -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
@@ -76,7 +77,7 @@ jobs:
- 9123335 - 9123335
- 8512546 - 8512546
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Setup node 24 - name: Setup node 24
uses: actions/setup-node@v6 uses: actions/setup-node@v6
@@ -105,7 +106,7 @@ jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Setup node 24 - name: Setup node 24
uses: actions/setup-node@v6 uses: actions/setup-node@v6

View File

@@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v7
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

View File

@@ -20,11 +20,11 @@ jobs:
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
with: with:
repository: daveol/SampleApplication repository: daveol/SampleApplication
- uses: actions/checkout@v6 - uses: actions/checkout@v7
with: with:
path: ./build/ path: ./build/

View File

@@ -23,10 +23,10 @@ See [action.yml](action.yml)
## Basic ## Basic
```yaml ```yaml
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v4 uses: actions/setup-java@v6
with: with:
java-version: '17' java-version: '17'
distribution: 'temurin' distribution: 'temurin'
@@ -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"'

778
dist/index.js vendored

File diff suppressed because it is too large Load Diff

6104
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -25,24 +25,24 @@
"author": "daveol", "author": "daveol",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@actions/core": "^3.0.0", "@actions/core": "^3.0.1",
"@actions/tool-cache": "^4.0.0" "@actions/tool-cache": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^30.0.0", "@types/jest": "^30.0.0",
"@types/node": "^24.0.0", "@types/node": "^24.13.5",
"@typescript-eslint/eslint-plugin": "^8.57.2", "@typescript-eslint/eslint-plugin": "^8.70.0",
"@typescript-eslint/parser": "^8.57.2", "@typescript-eslint/parser": "^8.70.0",
"esbuild": "^0.28.0", "esbuild": "^0.28.2",
"eslint": "^10.1.0", "eslint": "^10.10.0",
"eslint-plugin-check-file": "^3.3.1", "eslint-plugin-check-file": "^3.3.2",
"eslint-plugin-jest": "^29.15.1", "eslint-plugin-jest": "^29.16.6",
"globals": "^17.4.0", "globals": "^17.12.0",
"jest": "^30.3.0", "jest": "^30.5.2",
"jest-circus": "^30.3.0", "jest-circus": "^30.3.0",
"js-yaml": "^4.1.0", "js-yaml": "^5.4.2",
"prettier": "^3.3.2", "prettier": "^3.9.7",
"ts-jest": "^29.1.5", "ts-jest": "^29.4.12",
"typescript": "^5.9.3" "typescript": "^6.0.3"
} }
} }

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') {
if (Number(VERSION_LONG) >= 15859902) {
cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_ARM64_URL
} else {
cmdlineToolsURL = COMMANDLINE_TOOLS_MAC_URL 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 {

View File

@@ -6,6 +6,7 @@
"lib": [ "lib": [
"ES2024" "ES2024"
], ],
"types": ["node", "jest"],
"outDir": "./lib", "outDir": "./lib",
"rootDir": "./src", "rootDir": "./src",
"strict": true, "strict": true,