Merge branch 'main' into adjust-end

Author: ithinkihaveacat

gradle/libs.versions.toml

@@ -2,23 +2,23 @@
 accompanist = "0.36.0"
 activityKtx = "1.10.1"
 android-googleid = "1.1.1"
-androidGradlePlugin = "8.10.0"
+androidGradlePlugin = "8.10.1"
 androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2025.05.00"
+androidx-compose-bom = "2025.06.01"
 androidx-compose-ui-test = "1.7.0-alpha08"
-androidx-compose-ui-test-junit4-accessibility = "1.9.0-alpha02"
+androidx-compose-ui-test-junit4-accessibility = "1.9.0-beta01"
 androidx-constraintlayout = "2.2.1"
 androidx-constraintlayout-compose = "1.1.1"
 androidx-coordinator-layout = "1.3.0"
 androidx-corektx = "1.16.0"
 androidx-credentials = "1.5.0"
 androidx-credentials-play-services-auth = "1.5.0"
 androidx-emoji2-views = "1.5.0"
-androidx-fragment-ktx = "1.8.6"
+androidx-fragment-ktx = "1.8.8"
 androidx-glance-appwidget = "1.1.1"
-androidx-lifecycle-compose = "2.9.0"
-androidx-lifecycle-runtime-compose = "2.9.0"
+androidx-lifecycle-compose = "2.9.1"
+androidx-lifecycle-runtime-compose = "2.9.1"
 androidx-navigation = "2.9.0"
 androidx-paging = "3.3.6"
 androidx-startup-runtime = "1.2.0"
@@ -30,12 +30,16 @@ androidx-window-core = "1.5.0-alpha02"
 androidx-window-java = "1.5.0-alpha02"
 # @keep
 androidx-xr = "1.0.0-alpha03"
+# @keep
+androidx-xr-arcore = "1.0.0-alpha04"
+androidx-xr-compose = "1.0.0-alpha04"
+androidx-xr-scenecore = "1.0.0-alpha04"
 androidxHiltNavigationCompose = "1.2.0"
-appcompat = "1.7.0"
+appcompat = "1.7.1"
 coil = "2.7.0"
 # @keep
 compileSdk = "35"
-compose-latest = "1.8.1"
+compose-latest = "1.8.3"
 composeUiTooling = "1.4.1"
 coreSplashscreen = "1.0.1"
 coroutines = "1.10.2"
@@ -44,39 +48,35 @@ google-maps = "19.2.0"
 gradle-versions = "0.52.0"
 guava = "33.4.8-jre"
 hilt = "2.56.2"
-horologist = "0.7.10-alpha"
+horologist = "0.7.14-beta"
 junit = "4.13.2"
-kotlin = "2.1.20"
+kotlin = "2.2.0"
 kotlinCoroutinesOkhttp = "1.0"
 kotlinxCoroutinesGuava = "1.10.2"
 kotlinxSerializationJson = "1.8.1"
-ksp = "2.1.20-2.0.1"
+ksp = "2.1.21-2.0.2"
 lifecycleService = "2.9.1"
 maps-compose = "6.6.0"
-material = "1.13.0-alpha13"
+material = "1.14.0-alpha02"
 material3-adaptive = "1.1.0"
 material3-adaptive-navigation-suite = "1.3.2"
-media3 = "1.6.1"
+media3 = "1.7.1"
 # @keep
 minSdk = "21"
 okHttp = "4.12.0"
 playServicesWearable = "19.0.0"
-protolayout = "1.3.0-beta02"
+protolayout = "1.3.0"
 recyclerview = "1.4.0"
-# @keep
-androidx-xr-arcore = "1.0.0-alpha04"
-androidx-xr-scenecore = "1.0.0-alpha04"
-androidx-xr-compose = "1.0.0-alpha04"
 targetSdk = "34"
-tiles = "1.5.0-beta01"
+tiles = "1.5.0"
 version-catalog-update = "1.0.0"
 wear = "1.3.0"
-wearComposeFoundation = "1.5.0-beta01"
-wearComposeMaterial = "1.5.0-beta01"
-wearComposeMaterial3 = "1.5.0-beta01"
+wearComposeFoundation = "1.5.0-beta04"
+wearComposeMaterial = "1.5.0-beta04"
+wearComposeMaterial3 = "1.5.0-beta04"
 wearOngoing = "1.0.0"
 wearToolingPreview = "1.0.0"
-webkit = "1.13.0"
+webkit = "1.14.0"
 
 [libraries]
 accompanist-adaptive = "com.google.accompanist:accompanist-adaptive:0.37.3"
@@ -158,14 +158,13 @@ androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
 androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window-core" }
 androidx-window-java = { module = "androidx.window:window-java", version.ref = "androidx-window-java" }
-androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.1"
+androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.2"
 androidx-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr-arcore" }
 androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr-compose" }
 androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr-scenecore" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearComposeFoundation" }
-wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
 compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
 glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }
 google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -185,6 +184,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
 play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
+wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
 wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
 
 [plugins]
@@ -193,7 +193,7 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.1.21" }
+kotlin-android = "org.jetbrains.kotlin.android:2.2.0"
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

wear/src/main/java/com/example/wear/snippets/m3/tile/Interaction.kt

@@ -174,20 +174,19 @@ class InteractionDeepLink : TileService() {
 
 class InteractionLoadAction : BaseTileService() {
 
+    // [START android_wear_m3_interaction_loadaction_request]
     override fun onTileRequest(
         requestParams: RequestBuilders.TileRequest
     ): ListenableFuture<Tile> {
 
-        val name: String?
-        val age: Int?
-
         // When triggered by loadAction(), "name" will be "Javier", and "age" will
         // be 37.
         with(requestParams.currentState.stateMap) {
-            name = this[stringAppDataKey("name")]
-            age = this[intAppDataKey("age")]
+            val name = this[stringAppDataKey("name")]
+            val age = this[intAppDataKey("age")]
         }
 
+        // [START_EXCLUDE]
         return Futures.immediateFuture(
             Tile.Builder()
                 .setResourcesVersion(RESOURCES_VERSION)
@@ -200,7 +199,9 @@ class InteractionLoadAction : BaseTileService() {
                 )
                 .build()
         )
+        // [END_EXCLUDE]
     }
+    // [END android_wear_m3_interaction_loadaction_request]
 
     override fun MaterialScope.tileLayout(
         requestParams: RequestBuilders.TileRequest