diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index b9758ff3eb..f47bc330bb 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -1,46 +1,45 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -# To regenerate this file, run: ./gradlew dependencies --write-locks -androidx.databinding:databinding-common:9.4.0=classpath -androidx.databinding:databinding-compiler-common:9.4.0=classpath +androidx.databinding:databinding-common:9.4.1=classpath +androidx.databinding:databinding-compiler-common:9.4.1=classpath androidx.room:androidx.room.gradle.plugin:2.8.4=classpath androidx.room:room-gradle-plugin:2.8.4=classpath -com.android.application:com.android.application.gradle.plugin:9.4.0=classpath -com.android.databinding:baseLibrary:9.4.0=classpath -com.android.library:com.android.library.gradle.plugin:9.4.0=classpath -com.android.tools.analytics-library:crash:32.4.0=classpath -com.android.tools.analytics-library:protos:32.4.0=classpath -com.android.tools.analytics-library:shared:32.4.0=classpath -com.android.tools.analytics-library:tracker:32.4.0=classpath +com.android.application:com.android.application.gradle.plugin:9.4.1=classpath +com.android.databinding:baseLibrary:9.4.1=classpath +com.android.library:com.android.library.gradle.plugin:9.4.1=classpath +com.android.tools.analytics-library:crash:32.4.1=classpath +com.android.tools.analytics-library:protos:32.4.1=classpath +com.android.tools.analytics-library:shared:32.4.1=classpath +com.android.tools.analytics-library:tracker:32.4.1=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:9.4.0-15978811=classpath -com.android.tools.build:aaptcompiler:9.4.0=classpath -com.android.tools.build:apksig:9.4.0=classpath -com.android.tools.build:apkzlib:9.4.0=classpath -com.android.tools.build:builder-model:9.4.0=classpath -com.android.tools.build:builder-test-api:9.4.0=classpath -com.android.tools.build:builder:9.4.0=classpath +com.android.tools.build:aapt2-proto:9.4.1-15978811=classpath +com.android.tools.build:aaptcompiler:9.4.1=classpath +com.android.tools.build:apksig:9.4.1=classpath +com.android.tools.build:apkzlib:9.4.1=classpath +com.android.tools.build:builder-model:9.4.1=classpath +com.android.tools.build:builder-test-api:9.4.1=classpath +com.android.tools.build:builder:9.4.1=classpath com.android.tools.build:bundletool:1.18.3=classpath -com.android.tools.build:gradle-api:9.4.0=classpath -com.android.tools.build:gradle-common-api:9.4.0=classpath -com.android.tools.build:gradle-settings-api:9.4.0=classpath -com.android.tools.build:gradle:9.4.0=classpath -com.android.tools.build:manifest-merger:32.4.0=classpath -com.android.tools.ddms:ddmlib:32.4.0=classpath -com.android.tools.layoutlib:layoutlib-api:32.4.0=classpath -com.android.tools.lint:lint-model:32.4.0=classpath -com.android.tools.lint:lint-typedef-remover:32.4.0=classpath -com.android.tools.utp:gradle-work-action-api:32.4.0=classpath -com.android.tools:annotations:32.4.0=classpath -com.android.tools:common:32.4.0=classpath -com.android.tools:dvlib:32.4.0=classpath -com.android.tools:repository:32.4.0=classpath -com.android.tools:sdk-common:32.4.0=classpath -com.android.tools:sdklib:32.4.0=classpath -com.android:signflinger:9.4.0=classpath -com.android:zipflinger:9.4.0=classpath +com.android.tools.build:gradle-api:9.4.1=classpath +com.android.tools.build:gradle-common-api:9.4.1=classpath +com.android.tools.build:gradle-settings-api:9.4.1=classpath +com.android.tools.build:gradle:9.4.1=classpath +com.android.tools.build:manifest-merger:32.4.1=classpath +com.android.tools.ddms:ddmlib:32.4.1=classpath +com.android.tools.layoutlib:layoutlib-api:32.4.1=classpath +com.android.tools.lint:lint-model:32.4.1=classpath +com.android.tools.lint:lint-typedef-remover:32.4.1=classpath +com.android.tools.utp:gradle-work-action-api:32.4.1=classpath +com.android.tools:annotations:32.4.1=classpath +com.android.tools:common:32.4.1=classpath +com.android.tools:dvlib:32.4.1=classpath +com.android.tools:repository:32.4.1=classpath +com.android.tools:sdk-common:32.4.1=classpath +com.android.tools:sdklib:32.4.1=classpath +com.android:signflinger:9.4.1=classpath +com.android:zipflinger:9.4.1=classpath com.google.android.gms:strict-version-matcher-plugin:1.2.4=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath @@ -114,10 +113,10 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.20=classpath org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.4.20=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.4.20=classpath org.jetbrains.kotlin:kotlin-native-utils:2.4.20=classpath -org.jetbrains.kotlin:kotlin-reflect:2.4.0=classpath +org.jetbrains.kotlin:kotlin-reflect:2.4.10=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10=classpath -org.jetbrains.kotlin:kotlin-stdlib:2.4.0=classpath +org.jetbrains.kotlin:kotlin-stdlib:2.4.10=classpath org.jetbrains.kotlin:kotlin-tooling-core:2.4.20=classpath org.jetbrains.kotlin:kotlin-util-io:2.4.20=classpath org.jetbrains.kotlin:kotlin-util-klib-metadata:2.4.20=classpath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13c069cee5..29a6bdbb12 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ targetSdk = "37" minSdk = "29" # Dependency Versions -androidGradlePlugin = "9.4.0" +androidGradlePlugin = "9.4.1" androidxActivity = "1.13.0" androidxAppCompat = "1.8.0" androdixAutofill = "1.3.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index eddabd2eef..5097068a8d 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 760c45969c..1eca32e7b4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew.bat b/gradlew.bat index a51ec4f588..3185a43f78 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -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 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -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 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @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 +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 & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile index 1aa2035e27..709a43f74f 100644 --- a/settings-gradle.lockfile +++ b/settings-gradle.lockfile @@ -1,5 +1,4 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -# To regenerate this file, run: ./gradlew dependencies --write-locks empty=incomingCatalogForLibs0