diff --git a/.github/workflows/AlwaysOnKotlin.yml b/.github/workflows/AlwaysOnKotlin.yml index 19d5c6cac..76317a896 100644 --- a/.github/workflows/AlwaysOnKotlin.yml +++ b/.github/workflows/AlwaysOnKotlin.yml @@ -31,12 +31,12 @@ jobs: java-version: '17' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: build-root-directory: ${{ env.SAMPLE_PATH }} - name: Build project - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: check --stacktrace build-root-directory: ${{ env.SAMPLE_PATH }} @@ -94,7 +94,7 @@ jobs: echo 84831b9409646a918e30573bab4c9c91346d8abd > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license - name: Run instrumentation tests - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: roundApi${{ matrix.device }}Check build-root-directory: ${{ env.SAMPLE_PATH }} @@ -119,7 +119,7 @@ jobs: java-version: 17 - name: Build project - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: compose:assembleRelease build-root-directory: ${{ env.SAMPLE_PATH }} diff --git a/.github/workflows/WearTilesKotlin.yml b/.github/workflows/WearTilesKotlin.yml index 80941eb3f..b348c18c4 100644 --- a/.github/workflows/WearTilesKotlin.yml +++ b/.github/workflows/WearTilesKotlin.yml @@ -31,13 +31,13 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: build-root-directory: ${{ env.SAMPLE_PATH }} - name: Build project working-directory: ${{ env.SAMPLE_PATH }} - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: check --stacktrace build-root-directory: ${{ env.SAMPLE_PATH }} diff --git a/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.jar b/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.jar and b/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties b/AlwaysOnKotlin/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AlwaysOnKotlin/gradlew.bat b/AlwaysOnKotlin/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/AlwaysOnKotlin/gradlew.bat +++ b/AlwaysOnKotlin/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/ComposeStarter/gradle/libs.versions.toml b/ComposeStarter/gradle/libs.versions.toml index 67777f3a7..6ace92e1b 100644 --- a/ComposeStarter/gradle/libs.versions.toml +++ b/ComposeStarter/gradle/libs.versions.toml @@ -8,7 +8,7 @@ compose-ui-tooling = "1.3.0" horologist = "0.5.25" ktlint = "0.50.0" org-jetbrains-kotlin = "1.9.22" -robolectric = "4.11.1" +robolectric = "4.12" roborazzi = "1.11.0" ui-test-junit4 = "1.6.4" ui-test-manifest = "1.6.4" diff --git a/ComposeStarter/gradle/wrapper/gradle-wrapper.jar b/ComposeStarter/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/ComposeStarter/gradle/wrapper/gradle-wrapper.jar and b/ComposeStarter/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ComposeStarter/gradle/wrapper/gradle-wrapper.properties b/ComposeStarter/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ComposeStarter/gradlew.bat b/ComposeStarter/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/ComposeStarter/gradlew.bat +++ b/ComposeStarter/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/DataLayer/gradle/wrapper/gradle-wrapper.jar b/DataLayer/gradle/wrapper/gradle-wrapper.jar index d64cd4917..e6441136f 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 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.jar b/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.jar and b/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties b/WatchFaceKotlin/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WatchFaceKotlin/gradlew.bat b/WatchFaceKotlin/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/WatchFaceKotlin/gradlew.bat +++ b/WatchFaceKotlin/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/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.jar b/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.jar and b/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties b/WearComplicationDataSourcesTestSuite/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearComplicationDataSourcesTestSuite/gradlew.bat b/WearComplicationDataSourcesTestSuite/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/WearComplicationDataSourcesTestSuite/gradlew.bat +++ b/WearComplicationDataSourcesTestSuite/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/WearOAuth/gradle/libs.versions.toml b/WearOAuth/gradle/libs.versions.toml index ed8496930..bee19e45b 100644 --- a/WearOAuth/gradle/libs.versions.toml +++ b/WearOAuth/gradle/libs.versions.toml @@ -61,7 +61,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "org-jetbrains-kotlinx" } kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "org-jetbrains-kotlinx" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "org-jetbrains-kotlinx" } -org-robolectric = "org.robolectric:robolectric:4.11.1" +org-robolectric = "org.robolectric:robolectric:4.12" playservices-auth = "com.google.android.gms:play-services-auth:21.0.0" playservices-wearable = "com.google.android.gms:play-services-wearable:18.1.0" test-core = { module = "androidx.test:core", version.ref = "androidx-test" } diff --git a/WearOAuth/gradle/wrapper/gradle-wrapper.jar b/WearOAuth/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/WearOAuth/gradle/wrapper/gradle-wrapper.jar and b/WearOAuth/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WearOAuth/gradle/wrapper/gradle-wrapper.properties b/WearOAuth/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearOAuth/gradlew.bat b/WearOAuth/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/WearOAuth/gradlew.bat +++ b/WearOAuth/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/WearSpeakerSample/gradle/wrapper/gradle-wrapper.jar b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.jar and b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties b/WearSpeakerSample/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearSpeakerSample/gradlew.bat b/WearSpeakerSample/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/WearSpeakerSample/gradlew.bat +++ b/WearSpeakerSample/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/WearTilesKotlin/gradle/wrapper/gradle-wrapper.jar b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..e6441136f 100644 Binary files a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.jar and b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties b/WearTilesKotlin/gradle/wrapper/gradle-wrapper.properties index 2ea3535dc..e7646dead 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.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/WearTilesKotlin/gradlew.bat b/WearTilesKotlin/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/WearTilesKotlin/gradlew.bat +++ b/WearTilesKotlin/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