Sync with upstream

.github/workflows/build-test.yml

@@ -1,26 +1,20 @@
 name: Build & Test
 
 on:
-  pull_request:
-    paths-ignore:
-      - '**.md'
   push:
-    branches:
-      - main
-      - releases/*
     paths-ignore:
       - '**.md'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - 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
 
@@ -32,12 +26,12 @@ jobs:
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - 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
 
@@ -46,12 +40,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - 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
 
@@ -66,28 +60,31 @@ jobs:
         os:
           - ubuntu-24.04
           - ubuntu-22.04
-          - ubuntu-20.04
-          - macos-13
-          - macos-12
-          - macos-11
+          - macos-26
+          - macos-15
+          - macos-14
+          - windows-2025
           - windows-2022
-          - windows-2019
         cmdline-tools-version:
+          - 14742923
+          - 12266719
+          - 11479570
+          - 11076708
           - 10406996
           - 9862592
           - 9477386
           - 9123335
           - 8512546
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - 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'
@@ -108,12 +105,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - 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@v6
 
     # 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:
-    paths:
-      - 'dist/**.js'
-      - '.github/*.json'
+  workflow_dispatch:
   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@v6
         with:
           repository: daveol/SampleApplication
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         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

@@ -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,13 +26,13 @@ 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'
 
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
 
 - name: Build SampleApplication
   run: ./gradlew --no-daemon build
@@ -47,7 +47,7 @@ Additional packages can be installed at a later time by calling sdkmanager manua
 
 ```yaml
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
   with:
     packages: ''
 
@@ -61,24 +61,28 @@ 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
 - name: Setup Android SDK
-  uses: android-actions/setup-android@v3
+  uses: android-actions/setup-android@v4
   with:
     cmdline-tools-version: 8512546
 ```
 
 #### Version table
 | Short version | Long version |
-| --- | --- |
-| 11.0 | 10406996 |
-| 10.0 | 9862592 |
-| 9.0 | 9477386 |
-| 8.0 | 9123335 |
-| 7.0 | 8512546 |
+|---------------| --- |
+| 20.0          | 14742923 |
+| 16.0          | 12266719 |
+| 13.0          | 11479570 |
+| 12.0          | 11076708 |
+| 11.0          | 10406996 |
+| 10.0          | 9862592 |
+| 9.0           | 9477386 |
+| 8.0           | 9123335 |
+| 7.0           | 8512546 |
 
 Current cmdline tools version can be found at https://developer.android.com/studio#command-line-tools-only
 

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: