diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c6f9ec4..9375b65e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Update SDK command-line tools to `23.0`. - [#492](https://github.com/ReactiveCircus/android-emulator-runner/pull/492) + ## v2.38.0 * Update SDK build tools to `37.0.0`. - [#475](https://github.com/ReactiveCircus/android-emulator-runner/pull/475) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index 87621fdf..d8475988 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -40,8 +40,8 @@ const io = __importStar(require("@actions/io")); const tc = __importStar(require("@actions/tool-cache")); const fs = __importStar(require("fs")); const BUILD_TOOLS_VERSION = '37.0.0'; -// SDK command-line tools 22.0 -const CMDLINE_TOOLS_VERSION = '15859902'; +// SDK command-line tools 23.0 +const CMDLINE_TOOLS_VERSION = '16111833'; const CMDLINE_TOOLS_URL_MAC = `https://dl.google.com/android/repository/commandlinetools-mac_x86_64-${CMDLINE_TOOLS_VERSION}_latest.zip`; const CMDLINE_TOOLS_URL_LINUX = `https://dl.google.com/android/repository/commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip`; /** diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 72b1d3ad..b284269d 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -5,8 +5,8 @@ import * as tc from '@actions/tool-cache'; import * as fs from 'fs'; const BUILD_TOOLS_VERSION = '37.0.0'; -// SDK command-line tools 22.0 -const CMDLINE_TOOLS_VERSION = '15859902'; +// SDK command-line tools 23.0 +const CMDLINE_TOOLS_VERSION = '16111833'; const CMDLINE_TOOLS_URL_MAC = `https://dl.google.com/android/repository/commandlinetools-mac_x86_64-${CMDLINE_TOOLS_VERSION}_latest.zip`; const CMDLINE_TOOLS_URL_LINUX = `https://dl.google.com/android/repository/commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip`; diff --git a/test-fixture/app/build.gradle.kts b/test-fixture/app/build.gradle.kts index 0af471a2..57f1c7a7 100644 --- a/test-fixture/app/build.gradle.kts +++ b/test-fixture/app/build.gradle.kts @@ -30,7 +30,7 @@ tasks.withType().configureEach } dependencies { - implementation("androidx.appcompat:appcompat:1.7.1") + implementation("androidx.appcompat:appcompat:1.8.0") androidTestImplementation("androidx.test.ext:junit:1.3.0") androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") } diff --git a/test-fixture/build.gradle.kts b/test-fixture/build.gradle.kts index f46a7256..bd2de87e 100644 --- a/test-fixture/build.gradle.kts +++ b/test-fixture/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.android.application") version "9.1.0" apply false - id("org.jetbrains.kotlin.android") version "2.3.10" apply false + id("com.android.application") version "9.3.2" apply false + id("org.jetbrains.kotlin.android") version "2.4.10" apply false } diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.jar b/test-fixture/gradle/wrapper/gradle-wrapper.jar index d997cfc6..eddabd2e 100644 Binary files a/test-fixture/gradle/wrapper/gradle-wrapper.jar and b/test-fixture/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a..ad7845be 100644 --- a/test-fixture/gradle/wrapper/gradle-wrapper.properties +++ b/test-fixture/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test-fixture/gradlew b/test-fixture/gradlew index 0262dcbd..249efbb0 100755 --- a/test-fixture/gradlew +++ b/test-fixture/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/test-fixture/gradlew.bat b/test-fixture/gradlew.bat index e509b2dd..8508ef68 100644 --- a/test-fixture/gradlew.bat +++ b/test-fixture/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,29 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%