diff --git a/.github/workflows/benchmark_suite.yml b/.github/workflows/benchmark_suite.yml index a16631ebcd2..5d94e45ebe9 100644 --- a/.github/workflows/benchmark_suite.yml +++ b/.github/workflows/benchmark_suite.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml index 5671859b86c..2a08a82737d 100644 --- a/.github/workflows/build_prod.yml +++ b/.github/workflows/build_prod.yml @@ -46,7 +46,7 @@ jobs: uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: zulu diff --git a/.github/workflows/build_sandbox.yml b/.github/workflows/build_sandbox.yml index ae4aaa254c7..9935434c419 100644 --- a/.github/workflows/build_sandbox.yml +++ b/.github/workflows/build_sandbox.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: zulu diff --git a/.github/workflows/build_staging.yml b/.github/workflows/build_staging.yml index 8408372e20b..e3e73fd8182 100644 --- a/.github/workflows/build_staging.yml +++ b/.github/workflows/build_staging.yml @@ -45,7 +45,7 @@ jobs: uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: zulu diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml index 3fecd3277d0..f1a723728c0 100644 --- a/.github/workflows/ci_checks.yml +++ b/.github/workflows/ci_checks.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 @@ -116,7 +116,7 @@ jobs: script: echo "Generated AVD snapshot for caching." - name: set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6699ce8536c..436b1abb21c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ - Bump Compose BOM to v2025.09.01 - Bump Sentry Android to v5.12.0 - Update GH Actions `checkout` to v5 +- Update GH Actions `setup-jdk` to to v5 +- Bump Gradle to v9.1.0 +- Bump Mockito Kotlin to v6.0.0 ### Changes diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8284965e49..2159c51ef7d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -142,7 +142,7 @@ lottie = "com.airbnb.android:lottie-compose:6.6.9" material = "com.google.android.material:material:1.13.0" -mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0" +mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.0.0" mobius-android = { module = "com.spotify.mobius:mobius-android", version.ref = "mobius" } mobius-core = { module = "com.spotify.mobius:mobius-core", version.ref = "mobius" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baab..8bdaf60c75a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476b..2e1113280ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a93670..adff685a034 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee8452..e509b2dd8fe 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell