diff --git a/datastore/build.gradle.kts b/datastore/build.gradle.kts index e8364bd97..d0679432e 100644 --- a/datastore/build.gradle.kts +++ b/datastore/build.gradle.kts @@ -106,7 +106,7 @@ dependencies { // [START android_datastore_proto_task] protobuf { protoc { - artifact = "com.google.protobuf:protoc:4.34.0" + artifact = "com.google.protobuf:protoc:4.34.1" } generateProtoTasks { all().forEach { task -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 35f5e8347..563a23132 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,43 +2,43 @@ accompanist = "0.36.0" activityKtx = "1.13.0" android-googleid = "1.2.0" -androidGradlePlugin = "9.1.0" +androidGradlePlugin = "9.2.0" androidx-activity-compose = "1.13.0" androidx-appcompat = "1.7.1" androidx-appfunctions = "1.0.0-alpha08" androidx-cameraX = "1.6.0" androidx-car = "1.7.0" -androidx-compose-bom = "2026.03.00" +androidx-compose-bom = "2026.04.01" androidx-compose-ui-test = "1.7.0-alpha08" -androidx-compose-ui-test-junit4-accessibility = "1.11.0-beta01" +androidx-compose-ui-test-junit4-accessibility = "1.11.0" androidx-constraintlayout = "2.2.1" androidx-constraintlayout-compose = "1.1.1" androidx-coordinator-layout = "1.3.0" androidx-corektx = "1.18.0" -androidx-credentials = "1.6.0-rc02" -androidx-credentials-play-services-auth = "1.6.0-rc02" +androidx-credentials = "1.6.0" +androidx-credentials-play-services-auth = "1.6.0" androidx-emoji2-views = "1.6.0" androidx-fragment = "1.8.9" androidx-glance-appwidget = "1.1.1" androidx-lifecycle-compose = "2.10.0" androidx-lifecycle-runtime-compose = "2.10.0" -androidx-lifecycle-viewmodel-navigation3 = "2.10.0-beta01" -androidx-navigation = "2.9.7" -androidx-navigation3 = "1.1.0" +androidx-lifecycle-viewmodel-navigation3 = "2.10.0" +androidx-navigation = "2.9.8" +androidx-navigation3 = "1.1.1" androidx-paging = "3.4.2" androidx-startup-runtime = "1.2.0" androidx-test = "1.7.0" -androidx-test-core-ktx = "1.6.1" +androidx-test-core-ktx = "1.7.0" androidx-test-espresso = "3.7.0" androidx-test-junit = "1.3.0" androidx-window = "1.5.1" androidx-window-core = "1.5.1" androidx-window-java = "1.5.1" -androidx-work-runtime = "2.11.1" +androidx-work-runtime = "2.11.2" androidx-xr-arcore = "1.0.0-alpha12" androidx-xr-arcore-play-services = "1.0.0-alpha12" androidx-xr-compose = "1.0.0-alpha12" -androidx-xr-glimmer = "1.0.0-alpha09" +androidx-xr-glimmer = "1.0.0-alpha11" androidx-xr-projected = "1.0.0-alpha06" androidx-xr-scenecore = "1.0.0-alpha13" androidxHiltNavigationCompose = "1.3.0" @@ -46,8 +46,8 @@ appcompat = "1.7.1" coil = "2.7.0" # @keep compileSdk = "36" -compose-latest = "1.10.5" -composeUiTooling = "1.5.6" +compose-latest = "1.11.0" +composeUiTooling = "1.6.1" coreSplashscreen = "1.2.0" coroutines = "1.10.2" crossdeviceprompt = "0.0.1" @@ -55,66 +55,66 @@ dataStore = "1.2.1" datastoreCore = "1.2.1" datastorePreferencesRxjava2 = "1.2.1" datastorePreferencesRxjava3 = "1.2.1" -firebase-bom = "34.10.0" -glide = "1.0.0-beta08" -google-ar-core = "1.53.0" +firebase-bom = "34.12.0" +glide = "1.0.0-beta09" +google-ar-core = "1.54.0" google-maps = "20.0.0" -gradle-versions = "0.53.0" -guava = "33.5.0-jre" -guava-android = "33.5.0-jre" -health-connect = "1.1.0-alpha11" +gradle-versions = "0.54.0" +guava = "33.6.0-jre" +guava-android = "33.6.0-jre" +health-connect = "1.1.0" hilt = "2.59.2" horologist = "0.8.3-alpha" junit = "4.13.2" -kotlin = "2.3.10" +kotlin = "2.3.21" kotlinCoroutinesOkhttp = "1.0" kotlinxCoroutinesGuava = "1.10.2" -kotlinxSerialization = "1.10.0" -ksp = "2.3.6" +kotlinxSerialization = "1.11.0" +ksp = "2.3.7" ktlint = "1.5.0" lifecycleService = "2.10.0" -maps-compose = "8.2.1" -material = "1.14.0-alpha10" +maps-compose = "8.3.0" +material = "1.14.0-rc01" material3-adaptive = "1.2.0" material3-adaptive-navigation-suite = "1.4.0" -material3-adaptive-navigation3 = "1.3.0-alpha09" -media3 = "1.9.2" -media3Ui = "1.9.2" -mockitoKotlin = "5.3.1" +material3-adaptive-navigation3 = "1.3.0-alpha10" +media3 = "1.10.0" +media3Ui = "1.10.0" +mockitoKotlin = "6.3.0" # @keep minSdk = "36" okHttp = "5.3.2" -playServicesWearable = "19.0.0" +playServicesWearable = "20.0.1" playbilling = "8.3.0" -protobuf = "4.34.0" -protoc = "0.9.6" -protolayout = "1.3.0" +protobuf = "4.34.1" +protoc = "0.10.0" +protolayout = "1.4.0" reactive-streams = "1.0.4" recyclerview = "1.4.0" registryDigitalCredentials = "1.0.0-alpha04" robolectric = "4.16.1" -roborazzi = "1.59.0" -spotless = "8.3.0" +roborazzi = "1.60.0" +spotless = "8.4.0" targetSdk = "36" -tiles = "1.5.0" +tiles = "1.6.0" tracing = "1.3.0" -truth = "1.4.4" -tvComposeMaterial3 = "1.1.0-beta01" +truth = "1.4.5" +tvComposeMaterial3 = "1.1.0-rc01" validatorPush = "1.0.0-alpha09" version-catalog-update = "1.1.0" watchfaceComplicationsDataSourceKtx = "1.3.0" wear = "1.4.0" -wearComposeFoundation = "1.6.0-rc01" -wearComposeMaterial = "1.6.0-rc01" -wearComposeMaterial3 = "1.6.0-rc01" +wearComposeFoundation = "1.6.1" +wearComposeMaterial = "1.6.1" +wearComposeMaterial3 = "1.6.1" wearInput = "1.2.0" wearOngoing = "1.1.0" wearPhoneInteractions = "1.1.0" wearRemoteInteractions = "1.2.0" wearToolingPreview = "1.0.0" webkit = "1.15.0" -wfp = "1.0.0-rc01" -androidx-core-telecom = "1.1.0-alpha04" +wfp = "1.0.0" +androidx-core-telecom = "1.1.0-alpha05" [libraries] accompanist-adaptive = "com.google.accompanist:accompanist-adaptive:0.37.3" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f..b1b8ef56b 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 dbc3ce4a0..b52fb7e71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 983fb2e97..b9bb139f7 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. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -170,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" ) @@ -203,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. -# * For validator: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 7101f8e46..aa5f10b06 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -21,8 +23,8 @@ @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=. @@ -49,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:"=% @@ -63,30 +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 -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -: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 +@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 -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%