diff --git a/AlwaysOnKotlin/gradle/libs.versions.toml b/AlwaysOnKotlin/gradle/libs.versions.toml index 3124568b5..82c9be86a 100644 --- a/AlwaysOnKotlin/gradle/libs.versions.toml +++ b/AlwaysOnKotlin/gradle/libs.versions.toml @@ -21,7 +21,7 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } androidx-wear = "androidx.wear:wear:1.3.0" androidx-window = "androidx.window:window:1.2.0" -com-google-truth = "com.google.truth:truth:1.3.0" +com-google-truth = "com.google.truth:truth:1.4.0" compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } compose-ui = { module = "androidx.compose.ui:ui" } compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } diff --git a/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties b/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ComposeAdvanced/gradle/wrapper/gradle-wrapper.properties b/ComposeAdvanced/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/ComposeAdvanced/gradle/wrapper/gradle-wrapper.properties +++ b/ComposeAdvanced/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ComposeStarter/gradle/wrapper/gradle-wrapper.properties b/ComposeStarter/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/ComposeStarter/gradle/wrapper/gradle-wrapper.properties +++ b/ComposeStarter/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/DataLayer/gradle/wrapper/gradle-wrapper.jar b/DataLayer/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/DataLayer/gradle/wrapper/gradle-wrapper.jar and b/DataLayer/gradle/wrapper/gradle-wrapper.jar differ diff --git a/DataLayer/gradle/wrapper/gradle-wrapper.properties b/DataLayer/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/DataLayer/gradle/wrapper/gradle-wrapper.properties +++ b/DataLayer/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/DataLayer/gradlew.bat b/DataLayer/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/DataLayer/gradlew.bat +++ b/DataLayer/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail diff --git a/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.jar b/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.jar and b/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.jar differ diff --git a/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties b/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties +++ b/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/RuntimePermissionsWear/gradlew.bat b/RuntimePermissionsWear/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/RuntimePermissionsWear/gradlew.bat +++ b/RuntimePermissionsWear/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 goto fail diff --git a/TimeText/gradle/libs.versions.toml b/TimeText/gradle/libs.versions.toml index 49b48bb80..4a180794e 100644 --- a/TimeText/gradle/libs.versions.toml +++ b/TimeText/gradle/libs.versions.toml @@ -18,7 +18,7 @@ androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" androidx-core-ktx = "androidx.core:core-ktx:1.12.0" androidx-databinding-viewbinding = "androidx.databinding:viewbinding:8.2.2" androidx-wear = "androidx.wear:wear:1.3.0" -com-google-truth = "com.google.truth:truth:1.3.0" +com-google-truth = "com.google.truth:truth:1.4.0" jacoco-ant = "org.jacoco:org.jacoco.ant:0.8.11" kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "org-jetbrains-kotlin" } diff --git a/TimeText/gradle/wrapper/gradle-wrapper.properties b/TimeText/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/TimeText/gradle/wrapper/gradle-wrapper.properties +++ b/TimeText/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties b/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties b/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties +++ b/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearOAuth/gradle/libs.versions.toml b/WearOAuth/gradle/libs.versions.toml index 948307680..c48125fa1 100644 --- a/WearOAuth/gradle/libs.versions.toml +++ b/WearOAuth/gradle/libs.versions.toml @@ -36,7 +36,7 @@ androidx-media = "androidx.media:media:1.7.0" androidx-wear = "androidx.wear:wear:1.3.0" androidx-wear-watchface-complications-data-source-ktx = "androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.1" androidx-window = "androidx.window:window:1.2.0" -com-google-truth = "com.google.truth:truth:1.3.0" +com-google-truth = "com.google.truth:truth:1.4.0" compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } compose-material = { module = "androidx.compose.material:material", version.ref = "compose" } diff --git a/WearOAuth/gradle/wrapper/gradle-wrapper.properties b/WearOAuth/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearOAuth/gradle/wrapper/gradle-wrapper.properties +++ b/WearOAuth/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties +++ b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearStandaloneGoogleSignIn/gradle/wrapper/gradle-wrapper.properties b/WearStandaloneGoogleSignIn/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearStandaloneGoogleSignIn/gradle/wrapper/gradle-wrapper.properties +++ b/WearStandaloneGoogleSignIn/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearVerifyRemoteApp/gradle/wrapper/gradle-wrapper.properties b/WearVerifyRemoteApp/gradle/wrapper/gradle-wrapper.properties index e6aba2515..2ea3535dc 100644 --- a/WearVerifyRemoteApp/gradle/wrapper/gradle-wrapper.properties +++ b/WearVerifyRemoteApp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME