Merge branch 'main' into screenshottesting

.github/workflows/Complications.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/ComposeStarter.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/DataLayer.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -64,7 +64,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/WatchFaceKotlin.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/WearOAuth.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/WearSpeakerSample.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -61,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/WearTilesKotlin.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.github/workflows/copy-branch.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it,
     # but specifies master branch (old default).
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       with:
         fetch-depth: 0
         ref: master

Complications/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-wear-watchface = "1.2.1"
 
 org-jetbrains-kotlin = "1.9.24"

ComposeStarter/README.md

@@ -32,7 +32,8 @@ This sample demonstrates two techniques for helping you design for different dis
 
 1.  Compose [`WearPreviewDevices`][wear-preview-devices] and [`WearPreviewFontScales`][wear-preview-font-scales] annotations: These generate a set of previews in the preview pane within Android Studio, for a range of different screen sizes and font display size settings, allowing you to see how your design would look.
 
-2.  Screenshot tests: This sample also demonstrates screenshot testing, for a set of [defined devices][wear-device]. For more information on screenshot testing, see this talk from [droidcon London][droidcon-talk].
+2.  Screenshot tests: This sample also demonstrates screenshot testing, for a set of [defined devices][wear-device]. For more information on screenshot testing, see this talk from [droidcon London][droidcon-talk], and see the [Continuous Integration][ci-guide] for more details on how to build screenshot
+    testing into your automated workflows.
 
     - To generate new images for the tests, run `./gradlew recordRoborazziDebug`
     - To test against existing reference images, run `./gradlew verifyRoborazziDebug`
@@ -55,3 +56,4 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 [wear-device]: https://github.com/android/wear-os-samples/blob/main/ComposeStarter/app/src/test/java/presentation/WearDevice.kt
 [wear-preview-font-scales]: https://developer.android.com/reference/kotlin/androidx/wear/compose/ui/tooling/preview/WearPreviewFontScales
 [wear-preview-devices]: https://developer.android.com/reference/kotlin/androidx/wear/compose/ui/tooling/preview/WearPreviewDevices
+[ci-guide]: https://developer.android.com/training/testing/continuous-integration

ComposeStarter/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-activity = "1.9.0"
-androidx-compose-bom = "2024.05.00"
+androidx-compose-bom = "2024.06.00"
 androidx-wear-compose = "1.3.1"
 compose-compiler = "1.5.14"
 compose-ui-tooling = "1.3.1"
@@ -10,8 +10,8 @@ ktlint = "0.50.0"
 org-jetbrains-kotlin = "1.9.24"
 robolectric = "4.12.2"
 roborazzi = "1.20.0"
-ui-test-junit4 = "1.6.7"
-ui-test-manifest = "1.6.7"
+ui-test-junit4 = "1.6.8"
+ui-test-manifest = "1.6.8"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }

DataLayer/gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-activity = "1.9.0"
-androidx-compose-bom = "2024.05.00"
+androidx-compose-bom = "2024.06.00"
 # do not bump to 2.8.0 until bumping to beta version of Compose
-androidx-lifecycle = "2.7.0"
+androidx-lifecycle = "2.8.2"
 androidx-wear-compose = "1.3.1"
 compose-compiler = "1.5.14"
 ktlint = "0.50.0"
@@ -13,15 +13,15 @@ horologist = "0.5.27"
 compose-ui-tooling = "1.3.1"
 robolectric = "4.12.2"
 roborazzi = "1.20.0"
-ui-test-junit4 = "1.6.7"
-ui-test-manifest = "1.6.7"
+ui-test-junit4 = "1.6.8"
+ui-test-manifest = "1.6.8"
 
 [libraries]
 android-desugarjdklibs = "com.android.tools:desugar_jdk_libs:2.0.4"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" }
 androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.7.1"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.0"
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }

WatchFaceFormat/Complications/build.gradle.kts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
 }

WatchFaceFormat/Flavors/build.gradle.kts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
 }

WatchFaceFormat/SimpleAnalog/build.gradle.kts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
 }

WatchFaceFormat/SimpleDigital/build.gradle.kts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
 }

WatchFaceFormat/Weather/build.gradle.kts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
 }

WatchFaceKotlin/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-activity = "1.9.0"
-androidx-lifecycle = "2.8.1"
+androidx-lifecycle = "2.8.2"
 androidx-test = "1.4.0"
 androidx-wear-compose = "1.1.0-rc01"
 androidx-wear-tiles = "1.1.0"
@@ -12,11 +12,11 @@ org-jetbrains-kotlin = "1.9.24"
 org-jetbrains-kotlinx = "1.8.1"
 
 [libraries]
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.0"
 android-material = "com.google.android.material:material:1.12.0"
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
-androidx-databinding-viewbinding = "androidx.databinding:viewbinding:8.4.2"
+androidx-databinding-viewbinding = "androidx.databinding:viewbinding:8.5.0"
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-wear = "androidx.wear:wear:1.3.0"

WearOAuth/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-compose-bom = "2024.05.00"
 androidx-activity = "1.9.0"
-androidx-lifecycle = "2.8.1"
+androidx-lifecycle = "2.8.2"
 androidx-test = "1.5.2"
 androidx-wear-compose = "1.4.0-beta03"
 compose = "1.7.0-beta03"
@@ -19,9 +19,9 @@ ui-test-junit4 = "1.6.7"
 [libraries]
 android-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
 android-desugarjdklibs = "com.android.tools:desugar_jdk_libs:2.0.4"
-android-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.2"
+android-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.0"
 android-material = "com.google.android.material:material:1.12.0"
-android-tools-lint-gradle = "com.android.tools.lint:lint-gradle:31.4.2"
+android-tools-lint-gradle = "com.android.tools.lint:lint-gradle:31.5.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
@@ -30,9 +30,9 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 androidx-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
 androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
-androidx-databinding-viewbinding = "androidx.databinding:viewbinding:8.4.2"
+androidx-databinding-viewbinding = "androidx.databinding:viewbinding:8.5.0"
 androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.1.1"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.7.1"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.0"
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }

WearSpeakerSample/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-activity = "1.9.0"
-androidx-compose-bom = "2024.05.00"
+androidx-compose-bom = "2024.06.00"
 androidx-lifecycle = "2.7.0"
 androidx-media3 = "1.3.1"
 androidx-wear-compose = "1.3.1"
@@ -11,8 +11,8 @@ ktlint = "0.50.0"
 org-jetbrains-kotlin = "1.9.24"
 robolectric = "4.12.2"
 roborazzi = "1.20.0"
-ui-test-junit4 = "1.6.7"
-ui-test-manifest = "1.6.7"
+ui-test-junit4 = "1.6.8"
+ui-test-manifest = "1.6.8"
 horologist = "0.5.27"
 androidx-constraintlayout-compose = "1.0.1"
 material3-android = "1.2.1"

WearTilesKotlin/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-android-gradle-plugin = "8.4.2"
+android-gradle-plugin = "8.5.0"
 androidx-wear-tiles = "1.4.0-alpha04"
 androidx-wear-tooling-preview = "1.0.0"
-compose = "1.6.7"
+compose = "1.6.8"
 compose-compiler = "1.5.14"
 horologist = "0.5.27"
 ktlint = "0.50.0"
@@ -12,8 +12,8 @@ tiles-tooling-preview = "1.3.0"
 
 [libraries]
 androidx-datastore = "androidx.datastore:datastore-preferences:1.1.1"
-androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.1"
-androidx-lifecycle-viewmodel-ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1"
+androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
+androidx-lifecycle-viewmodel-ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
 androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles-tooling-preview" }
 androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles-tooling-preview" }
 androidx-wear-tiles-material = { module = "androidx.wear.tiles:tiles-material", version.ref = "androidx-wear-tiles" }