chore: Cherry-picked changes from upstream

.github/workflows/build-test.yml

@@ -72,8 +72,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ github.actor == 'dependabot[bot]' && fromJSON('["ubuntu-24.04"]') || fromJSON('["ubuntu-24.04", "ubuntu-22.04", "macos-14", "windows-2022", "windows-2025"]') }}
+        os: ${{ github.actor == 'dependabot[bot]' && fromJSON('["ubuntu-24.04"]') || fromJSON('["ubuntu-24.04", "ubuntu-22.04", "macos-14", "macos-15", "macos-26", "windows-2022", "windows-2025"]') }}
         cmdline-tools-version:
+          - 14742923
           - 12266719
           - 11479570
           - 11076708

README.md

@@ -34,7 +34,7 @@ steps:
     distribution: 'temurin'
 
 - name: Setup Android SDK
-  uses: step-security/setup-android@v3
+  uses: step-security/setup-android@v4
 
 - name: Build SampleApplication
   run: ./gradlew --no-daemon build
@@ -49,7 +49,7 @@ Additional packages can be installed at a later time by calling sdkmanager manua
 
 ```yaml
 - name: Setup Android SDK
-  uses: step-security/setup-android@v3
+  uses: step-security/setup-android@v4
   with:
     packages: ''
 
@@ -63,19 +63,20 @@ 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 12266719 (short version 16.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: step-security/setup-android@v3
+  uses: step-security/setup-android@v4
   with:
     cmdline-tools-version: 8512546
 ```
 
 #### Version table
 | Short version | Long version |
 |---------------| --- |
+| 20.0          | 14742923 |
 | 16.0          | 12266719 |
 | 13.0          | 11479570 |
 | 12.0          | 11076708 |
@@ -97,4 +98,3 @@ Default option is 'yes', because otherwise SDK is unusable until said licenses a
 
 licenses are quite long, to prevent a wall of text in the action output, licenses can be agreed to silently.
 Input parameter `log-accepted-android-sdk-licenses` controls whether license texts should be printed or omitted from the text output. Defaults to 'true'.
-

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: '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"'