Migrate from ncc to esbuild

Allows updating @actions/core and @actions/tool-cache. Their old versions had dependencies with security issues.

.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

@@ -1,13 +1,7 @@
 name: Build & Test
 
 on:
-  pull_request:
-    paths-ignore:
-      - '**.md'
   push:
-    branches:
-      - main
-      - releases/*
     paths-ignore:
       - '**.md'
 
@@ -15,12 +9,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Setup node 20
+      - name: Setup node 24
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -32,12 +26,12 @@ jobs:
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Setup node 20
+      - name: Setup node 24
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -46,12 +40,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Setup node 20
+      - name: Setup node 24
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - run: npm ci
 
@@ -63,23 +57,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, windows-2019, windows-2022 ]
+        os:
+          - ubuntu-24.04
+          - ubuntu-22.04
+          - macos-26
+          - macos-15
+          - macos-14
+          - windows-2025
+          - windows-2022
         cmdline-tools-version:
+          - 14742923
+          - 12266719
+          - 11479570
+          - 11076708
           - 10406996
           - 9862592
           - 9477386
           - 9123335
           - 8512546
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Setup node 20
+      - name: Setup node 24
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'
@@ -100,12 +105,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: Setup node 20
+      - name: Setup node 24
-        uses: actions/setup-node@v4
+        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@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         languages: 'javascript'
         
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4

.github/workflows/run.yml

@@ -1,17 +1,10 @@
 name: Run Android build
 
 on:
-  pull_request:
+  workflow_dispatch:
-    paths:
-      - 'dist/**.js'
-      - '.github/*.json'
   push:
-    branches:
-      - main
-      - releases/*
     paths:
       - 'dist/**.js'
-      - '.github/*.json'
 
 jobs:
   build:
@@ -27,16 +20,16 @@ jobs:
     if: ${{ false }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: daveol/SampleApplication
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: ./build/
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'temurin'

README.md

@@ -3,10 +3,10 @@
 ![Build & Test](https://github.com/android-actions/setup-android/workflows/Build%20&%20Test/badge.svg)
 
 This action sets up the Android SDK tools by:
- - Downloading the SDK commandline tools, if the current version (11.0) is not found in either `$ANDROID_SDK_ROOT` or `$HOME/.android/sdk`.
+ - 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`.
- - Adding `platform-tools` (contains adb) and `cmdline-tools/11.0/bin` (contains sdkmanager) to `$PATH`.
+ - Adding `platform-tools` (contains adb) and `cmdline-tools/16.0/bin` (contains sdkmanager) to `$PATH`.
  - Setting up problem [matchers](/matchers.json).
 
 On Windows 2016 runners, this action also checks if `$ANDROID_SDK_ROOT` path contains spaces.
@@ -26,7 +26,7 @@ steps:
 - uses: actions/checkout@v4
 
 - name: Set up JDK 17
-  uses: actions/setup-java@v3
+  uses: actions/setup-java@v4
   with:
     java-version: '17'
     distribution: 'temurin'
@@ -61,7 +61,7 @@ Additional packages can be installed at a later time by calling sdkmanager manua
 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 10406996 (short version 11.0).
+By default, setup-android installs version 14742923 (short version 20.0).
 
 To install a different version, call setup-android with desired long version as the input parameter `cmdline-tools-version`:
 ```yaml
@@ -73,7 +73,11 @@ To install a different version, call setup-android with desired long version as
 
 #### Version table
 | Short version | Long version |
-| --- | --- |
+|---------------| --- |
+| 20.0          | 14742923 |
+| 16.0          | 12266719 |
+| 13.0          | 11479570 |
+| 12.0          | 11076708 |
 | 11.0          | 10406996 |
 | 10.0          | 9862592 |
 | 9.0           | 9477386 |

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: '10406996'
+    default: '14742923'
 
   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"'
@@ -24,7 +24,7 @@ inputs:
     default: 'tools 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.2",
+    "@actions/core": "^3.0.0",
-    "@actions/core": "^1.10.1",
+    "@actions/tool-cache": "^4.0.0"
-    "@actions/tool-cache": "^2.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.5",
+    "@types/jest": "^30.0.0",
-    "@types/node": "^20.6.5",
+    "@types/node": "^24.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
+    "@typescript-eslint/eslint-plugin": "^8.57.2",
-    "@typescript-eslint/parser": "^6.7.2",
+    "@typescript-eslint/parser": "^8.57.2",
-    "@vercel/ncc": "^0.38.0",
+    "esbuild": "^0.27.4",
-    "eslint": "^8.50.0",
+    "eslint": "^10.1.0",
-    "eslint-plugin-github": "^4.10.0",
+    "eslint-plugin-check-file": "^3.3.1",
-    "eslint-plugin-jest": "^27.4.0",
+    "eslint-plugin-jest": "^29.15.1",
-    "jest": "^29.7.0",
+    "globals": "^17.4.0",
-    "jest-circus": "^29.7.0",
+    "jest": "^30.3.0",
+    "jest-circus": "^30.3.0",
     "js-yaml": "^4.1.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.3.2",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.9.3"
   }
 }

src/main.ts

@@ -7,6 +7,14 @@ import * as os from 'os'
 
 function getVersionShort(versionLong: string): string {
   switch (versionLong) {
+    case '14742923':
+      return '20.0'
+    case '12266719':
+      return '16.0'
+    case '11479570':
+      return '13.0'
+    case '11076708':
+      return '12.0'
     case '10406996':
       return '11.0'
     case '9862592':
@@ -179,7 +187,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,24 @@
 {
   "compilerOptions": {
-      "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2024",
-      "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "module": "es2022",
-      "outDir": "./lib",                        /* Redirect output structure to the directory. */
+    "moduleResolution": "bundler",
-      "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    "lib": [
-      "strict": true,                           /* Enable all strict type-checking options. */
+      "ES2024"
-      "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'. */
+    "outDir": "./lib",
-      "moduleResolution": "node"
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true
   },
-    "exclude": ["node_modules", "**/*.test.ts"]
+  "exclude": [
+    "node_modules",
+    "**/*.test.ts",
+    "lib"
+  ]
 }