[CI] Add 15859902 to test matrix

(This was supposed to be added during previous commits)

.eslintignore

@@ -1,3 +0,0 @@
-dist/
-lib/
-node_modules/

.eslintrc.json

@@ -1,55 +0,0 @@
-{
-    "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/recommended"],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 9,
-      "sourceType": "module",
-      "project": "./tsconfig.json"
-    },
-    "rules": {
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": "error",
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/ban-ts-comment": "error",
-      "camelcase": "off",
-      "@typescript-eslint/consistent-type-assertions": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "semi": "off",
-      "@typescript-eslint/semi": ["error", "never"],
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "i18n-text/no-en": "off",
-      "@typescript-eslint/unbound-method": "error"
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "jest/globals": true
-    }
-  }

.github/workflows/build-test.yml

@@ -9,12 +9,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Setup node 20
-        uses: actions/setup-node@v4
+      - name: Setup node 24
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -26,12 +26,12 @@ jobs:
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Setup node 20
-        uses: actions/setup-node@v4
+      - name: Setup node 24
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -40,12 +40,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Setup node 20
-        uses: actions/setup-node@v4
+      - name: Setup node 24
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -60,13 +60,14 @@ jobs:
         os:
           - ubuntu-24.04
           - ubuntu-22.04
-          - ubuntu-20.04
+          - macos-26
+          - macos-15
           - macos-14
-          - macos-13
-          - macos-12
+          - windows-2025
           - windows-2022
-          - windows-2019
         cmdline-tools-version:
+          - 15859902
+          - 14742923
           - 12266719
           - 11479570
           - 11076708
@@ -76,15 +77,15 @@ jobs:
           - 9123335
           - 8512546
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Setup node 20
-        uses: actions/setup-node@v4
+      - name: Setup node 24
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
@@ -105,12 +106,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - name: Setup node 20
-        uses: actions/setup-node@v4
+      - name: Setup node 24
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 

.github/workflows/codeql-analysis.yml

@@ -31,13 +31,13 @@ jobs:
       
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: 'javascript'
         
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/run.yml

@@ -20,16 +20,16 @@ jobs:
     if: ${{ false }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           repository: daveol/SampleApplication
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           path: ./build/
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'

README.md

@@ -5,7 +5,7 @@
 This action sets up the Android SDK tools by:
  - Downloading the SDK commandline tools, if the current version (16.0) is not found in either `$ANDROID_SDK_ROOT` or `$HOME/.android/sdk`.
  - Accepting the SDK licenses.
- - Installing `tools` and `platform-tools`.
+ - Installing `platform-tools`.
  - Adding `platform-tools` (contains adb) and `cmdline-tools/16.0/bin` (contains sdkmanager) to `$PATH`.
  - Setting up problem [matchers](/matchers.json).
 
@@ -23,16 +23,16 @@ See [action.yml](action.yml)
 ## Basic
 ```yaml
 steps:
-- uses: actions/checkout@v4
+- uses: actions/checkout@v7
 
 - name: Set up JDK 17
-  uses: actions/setup-java@v3
+  uses: actions/setup-java@v6
   with:
     java-version: '17'
     distribution: 'temurin'
 
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
 
 - name: Build SampleApplication
   run: ./gradlew --no-daemon build
@@ -41,32 +41,56 @@ steps:
 ## Additional packages
 Input parameter `packages` controls which packages this action will install from Android SDK.
 
-Default value is `tools platform-tools`, supply an empty string to skip installing additional packages.
+Default value is `platform-tools`, supply an empty string to skip installing additional packages.
 
 Additional packages can be installed at a later time by calling sdkmanager manually.
 
 ```yaml
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
   with:
     packages: ''
 
 # ...
 
-- run: sdkmanager tools platform-tools
+- run: sdkmanager platform-tools
 ```
 
+## The deprecated `tools` package
+
+Google no longer serves the `tools` package, see [tools#tools-sdk](https://developer.android.com/tools#tools-sdk).
+Asking for it fails with `Failed to find package 'tools'`, so it is no longer part of the default value of `packages`.
+If it is requested explicitly, this action skips it with a warning rather than failing the build.
+
+Most of what `tools` provided now lives in the command line tools, which this action installs and adds to `$PATH`
+regardless of the `packages` input, so these need no install step at all:
+
+`apkanalyzer` `avdmanager` `lint` `screenshot2` `sdkmanager` `retrace` `resourceshrinker` `profgen` `d8` `r8`
+
+The emulator was split out of `tools` into its own package, request it explicitly if you need it:
+
+```yaml
+- name: Setup Android SDK
+  uses: android-actions/setup-android@v4
+  with:
+    packages: 'platform-tools emulator'
+```
+
+The remaining `tools` contents have no replacement in the current SDK: `android` was superseded by `sdkmanager` and
+`avdmanager`, ProGuard by [R8](https://developer.android.com/build/shrink-code), and `monitor`, `ddms`, `monkeyrunner`
+and `uiautomatorviewer` were dropped without one.
+
 ## SDK Version selection
 
 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.
 
-By default, setup-android installs version 12266719 (short version 16.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`:
 ```yaml
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
   with:
     cmdline-tools-version: 8512546
 ```
@@ -74,6 +98,8 @@ To install a different version, call setup-android with desired long version as
 #### Version table
 | Short version | Long version |
 |---------------| --- |
+| 22.0          | 15859902 |
+| 20.0          | 14742923 |
 | 16.0          | 12266719 |
 | 13.0          | 11479570 |
 | 12.0          | 11076708 |

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: '12266719'
+    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"'
@@ -21,10 +21,10 @@ inputs:
   packages:
     description: 'Additional packages to install'
     required: false
-    default: 'tools platform-tools'
+    default: 'platform-tools'
 
 runs:
-  using: node20
+  using: node24
   main: 'dist/index.js'
 
 branding:

eslint.config.js

@@ -0,0 +1,70 @@
+const jestPlugin = require('eslint-plugin-jest');
+const tsParser = require('@typescript-eslint/parser');
+const tsPlugin = require('@typescript-eslint/eslint-plugin');
+const checkFile = require('eslint-plugin-check-file');
+const globals = require('globals');
+
+module.exports = [
+    {
+        ignores: ['dist/', 'lib/', 'node_modules/']
+    },
+    {
+        files: ['**/*.ts', '**/*.tsx'],
+        plugins: {
+            jest: jestPlugin,
+            '@typescript-eslint': tsPlugin,
+            'check-file': checkFile,
+        },
+        languageOptions: {
+            parser: tsParser,
+            parserOptions: {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
+                project: './tsconfig.json',
+            },
+            globals: {
+                ...globals.node,
+                ...globals.es6,
+                ...globals.jest,
+            },
+        },
+        rules: {
+            'check-file/filename-naming-convention': ['error', {
+                '**/*.ts': 'KEBAB_CASE',
+            }],
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-unused-vars': 'error',
+            '@typescript-eslint/explicit-member-accessibility': ['error', {accessibility: 'no-public'}],
+            '@typescript-eslint/no-require-imports': 'error',
+            '@typescript-eslint/array-type': 'error',
+            '@typescript-eslint/await-thenable': 'error',
+            '@typescript-eslint/ban-ts-comment': 'error',
+            camelcase: 'off',
+            '@typescript-eslint/consistent-type-assertions': 'error',
+            '@typescript-eslint/explicit-function-return-type': ['error', {allowExpressions: true}],
+            'func-call-spacing': ['error', 'never'],
+            '@typescript-eslint/no-array-constructor': 'error',
+            '@typescript-eslint/no-empty-interface': 'error',
+            '@typescript-eslint/no-explicit-any': 'error',
+            '@typescript-eslint/no-extraneous-class': 'error',
+            '@typescript-eslint/no-for-in-array': 'error',
+            '@typescript-eslint/no-inferrable-types': 'error',
+            '@typescript-eslint/no-misused-new': 'error',
+            '@typescript-eslint/no-namespace': 'error',
+            '@typescript-eslint/no-non-null-assertion': 'warn',
+            '@typescript-eslint/no-unnecessary-qualifier': 'error',
+            '@typescript-eslint/no-unnecessary-type-assertion': 'error',
+            '@typescript-eslint/no-useless-constructor': 'error',
+            '@typescript-eslint/no-var-requires': 'error',
+            '@typescript-eslint/prefer-for-of': 'warn',
+            '@typescript-eslint/prefer-function-type': 'warn',
+            '@typescript-eslint/prefer-includes': 'error',
+            '@typescript-eslint/prefer-string-starts-ends-with': 'error',
+            '@typescript-eslint/promise-function-async': 'error',
+            '@typescript-eslint/require-array-sort-compare': 'error',
+            '@typescript-eslint/restrict-plus-operands': 'error',
+            semi: ['error', 'never'],
+            '@typescript-eslint/unbound-method': 'error',
+        },
+    },
+];

package.json

@@ -5,7 +5,7 @@
   "description": "setup android action",
   "main": "lib/main.js",
   "scripts": {
-    "build": "ncc build src/main.ts --out dist/",
+    "build": "tsc && esbuild lib/main.js --bundle --platform=node --target=node24 --format=cjs --outfile=dist/index.js",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
     "lint": "eslint src/*.ts",
@@ -25,24 +25,24 @@
   "author": "daveol",
   "license": "ISC",
   "dependencies": {
-    "@actions/cache": "^3.2.4",
-    "@actions/core": "^1.10.1",
-    "@actions/tool-cache": "^2.0.1"
+    "@actions/core": "^3.0.1",
+    "@actions/tool-cache": "^4.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.5",
-    "@types/node": "^20.6.5",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "@vercel/ncc": "^0.38.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-github": "^5.0.1",
-    "eslint-plugin-jest": "^28.6.0",
-    "jest": "^29.7.0",
-    "jest-circus": "^29.7.0",
-    "js-yaml": "^4.1.0",
-    "prettier": "^3.3.2",
-    "ts-jest": "^29.1.5",
-    "typescript": "^5.5.4"
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.13.5",
+    "@typescript-eslint/eslint-plugin": "^8.70.0",
+    "@typescript-eslint/parser": "^8.70.0",
+    "esbuild": "^0.28.2",
+    "eslint": "^10.10.0",
+    "eslint-plugin-check-file": "^3.3.2",
+    "eslint-plugin-jest": "^29.16.6",
+    "globals": "^17.12.0",
+    "jest": "^30.5.1",
+    "jest-circus": "^30.3.0",
+    "js-yaml": "^5.4.2",
+    "prettier": "^3.9.7",
+    "ts-jest": "^29.4.12",
+    "typescript": "^6.0.3"
   }
 }

src/main.ts

@@ -7,6 +7,10 @@ import * as os from 'os'
 
 function getVersionShort(versionLong: string): string {
   switch (versionLong) {
+    case '15859902':
+      return '22.0'
+    case '14742923':
+      return '20.0'
     case '12266719':
       return '16.0'
     case '11479570':
@@ -39,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')
@@ -103,7 +108,11 @@ async function installSdkManager(): Promise<string> {
     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 {
@@ -173,6 +182,19 @@ async function run(): Promise<void> {
     .filter(function (element, index, array) {
       return element
     })
+    .filter(function (pkg) {
+      // The 'tools' package is deprecated and no longer served by Google,
+      // asking sdkmanager for it fails the whole action.
+      // Its replacement, cmdline-tools, is already installed by this action.
+      if (pkg === 'tools') {
+        core.warning(
+          "Skipping deprecated package 'tools', it is no longer available in the Android SDK repository. " +
+            'The command line tools installed by this action replace it, see https://developer.android.com/tools#tools-sdk'
+        )
+        return false
+      }
+      return true
+    })
   for (const pkg of packages) {
     await callSdkManager(sdkManagerExe, pkg)
   }
@@ -185,7 +207,6 @@ async function run(): Promise<void> {
   core.addPath(path.join(ANDROID_SDK_ROOT, 'platform-tools'))
 
   core.debug('add matchers')
-  // eslint-disable-next-line no-console
   console.log(`##[add-matcher]${path.join(__dirname, '..', 'matchers.json')}`)
 }
 

tsconfig.json

@@ -1,13 +1,25 @@
 {
-    "compilerOptions": {
-      "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-      "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-      "outDir": "./lib",                        /* Redirect output structure to the directory. */
-      "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-      "strict": true,                           /* Enable all strict type-checking options. */
-      "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
-      "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-      "moduleResolution": "node"
-    },
-    "exclude": ["node_modules", "**/*.test.ts"]
+  "compilerOptions": {
+    "target": "ES2024",
+    "module": "es2022",
+    "moduleResolution": "bundler",
+    "lib": [
+      "ES2024"
+    ],
+    "types": ["node", "jest"],
+    "outDir": "./lib",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true
+  },
+  "exclude": [
+    "node_modules",
+    "**/*.test.ts",
+    "lib"
+  ]
 }