Merge branch 'main' into fix-recomp-highlighter

Author: mlykotom

gradle/libs.versions.toml

@@ -2,12 +2,12 @@
 accompanist = "0.36.0"
 activityKtx = "1.10.1"
 android-googleid = "1.1.1"
-androidGradlePlugin = "8.9.2"
+androidGradlePlugin = "8.10.0"
 androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2025.04.01"
+androidx-compose-bom = "2025.05.00"
 androidx-compose-ui-test = "1.7.0-alpha08"
-androidx-compose-ui-test-junit4-accessibility = "1.8.0-rc02"
+androidx-compose-ui-test-junit4-accessibility = "1.9.0-alpha02"
 androidx-constraintlayout = "2.2.1"
 androidx-constraintlayout-compose = "1.1.1"
 androidx-coordinator-layout = "1.3.0"
@@ -17,25 +17,25 @@ androidx-credentials-play-services-auth = "1.5.0"
 androidx-emoji2-views = "1.5.0"
 androidx-fragment-ktx = "1.8.6"
 androidx-glance-appwidget = "1.1.1"
-androidx-lifecycle-compose = "2.8.7"
-androidx-lifecycle-runtime-compose = "2.8.7"
-androidx-navigation = "2.8.9"
+androidx-lifecycle-compose = "2.9.0"
+androidx-lifecycle-runtime-compose = "2.9.0"
+androidx-navigation = "2.9.0"
 androidx-paging = "3.3.6"
 androidx-startup-runtime = "1.2.0"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
 androidx-test-junit = "1.2.1"
-androidx-window = "1.5.0-alpha01"
-androidx-window-core = "1.5.0-alpha01"
-androidx-window-java = "1.5.0-alpha01"
+androidx-window = "1.5.0-alpha02"
+androidx-window-core = "1.5.0-alpha02"
+androidx-window-java = "1.5.0-alpha02"
 # @keep
 androidx-xr = "1.0.0-alpha03"
 androidxHiltNavigationCompose = "1.2.0"
 appcompat = "1.7.0"
 coil = "2.7.0"
 # @keep
 compileSdk = "35"
-compose-latest = "1.8.0"
+compose-latest = "1.8.1"
 composeUiTooling = "1.4.1"
 coreSplashscreen = "1.0.1"
 coroutines = "1.10.2"
@@ -44,13 +44,13 @@ google-maps = "19.2.0"
 gradle-versions = "0.52.0"
 guava = "33.4.8-jre"
 hilt = "2.56.2"
-horologist = "0.6.23"
+horologist = "0.7.10-alpha"
 junit = "4.13.2"
 kotlin = "2.1.20"
 kotlinCoroutinesOkhttp = "1.0"
 kotlinxCoroutinesGuava = "1.10.2"
 kotlinxSerializationJson = "1.8.1"
-ksp = "2.1.20-2.0.0"
+ksp = "2.1.20-2.0.1"
 maps-compose = "6.6.0"
 material = "1.13.0-alpha13"
 material3-adaptive = "1.1.0"
@@ -60,20 +60,25 @@ media3 = "1.6.1"
 minSdk = "21"
 okHttp = "4.12.0"
 playServicesWearable = "19.0.0"
-protolayout = "1.2.1"
+protolayout = "1.3.0-beta02"
 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.4.1"
+tiles = "1.5.0-beta01"
 version-catalog-update = "1.0.0"
 wear = "1.3.0"
-wearComposeFoundation = "1.4.1"
-wearComposeMaterial = "1.4.1"
+wearComposeFoundation = "1.5.0-beta01"
+wearComposeMaterial = "1.5.0-beta01"
+wearComposeMaterial3 = "1.5.0-beta01"
 wearToolingPreview = "1.0.0"
 webkit = "1.13.0"
 
 [libraries]
-accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
-accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.37.2"
+accompanist-adaptive = "com.google.accompanist:accompanist-adaptive:0.37.3"
+accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.37.3"
 accompanist-theme-adapter-appcompat = { module = "com.google.accompanist:accompanist-themeadapter-appcompat", version.ref = "accompanist" }
 accompanist-theme-adapter-material = { module = "com.google.accompanist:accompanist-themeadapter-material", version.ref = "accompanist" }
 accompanist-theme-adapter-material3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanist" }
@@ -98,9 +103,9 @@ androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-latest" }
 androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
-androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose-latest"  }
-androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-latest"  }
-androidx-compose-ui-test-junit4-accessibility = { group = "androidx.compose.ui", name = "ui-test-junit4-accessibility", version.ref = "androidx-compose-ui-test-junit4-accessibility" }
+androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose-latest" }
+androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-latest" }
+androidx-compose-ui-test-junit4-accessibility = { module = "androidx.compose.ui:ui-test-junit4-accessibility", version.ref = "androidx-compose-ui-test-junit4-accessibility" }
 androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
@@ -131,6 +136,7 @@ androidx-paging-compose = { module = "androidx.paging:paging-compose", version.r
 androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", version.ref = "protolayout" }
 androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
 androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
+androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version.ref = "protolayout" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup-runtime" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
@@ -149,13 +155,13 @@ androidx-window = { module = "androidx.window:window", version.ref = "androidx-w
 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-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr" }
-androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr" }
-androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr" }
+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" }
-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
+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" }
@@ -175,6 +181,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-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

misc/src/main/java/com/example/snippets/ActivityEmbeddingJavaSnippets.java

@@ -1,5 +1,6 @@
 package com.example.snippets;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ -348,6 +349,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
     static class ActivityPinningSnippetsActivity extends Activity {
 
+        @SuppressLint("RequiresWindowSdk")
         @Override
         protected void onCreate(@Nullable Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);

misc/src/main/java/com/example/snippets/ActivityEmbeddingKotlinSnippets.kt

@@ -16,6 +16,7 @@
 
 package com.example.snippets
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
@@ -53,6 +54,7 @@ class ActivityEmbeddingKotlinSnippets {
 
     class SplitAttributesCalculatorSnippetsActivity : AppCompatActivity() {
 
+        @SuppressLint("RequiresWindowSdk")
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
 
@@ -224,6 +226,7 @@ class ActivityEmbeddingKotlinSnippets {
 
     class SplitAttributesBuilderSnippetsActivity : AppCompatActivity() {
 
+        @SuppressLint("RequiresWindowSdk")
         @RequiresApi(VERSION_CODES.M)
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
@@ -327,6 +330,7 @@ class ActivityEmbeddingKotlinSnippets {
     }
 
     class ActivityPinningSnippetsActivity : AppCompatActivity() {
+        @SuppressLint("RequiresWindowSdk")
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             setContentView(R.layout.activity_main)

wear/build.gradle.kts

@@ -59,6 +59,7 @@ dependencies {
     implementation(libs.androidx.wear)
     implementation(libs.androidx.protolayout)
     implementation(libs.androidx.protolayout.material)
+    implementation(libs.androidx.protolayout.material3)
     implementation(libs.androidx.protolayout.expression)
     debugImplementation(libs.androidx.tiles.renderer)
     testImplementation(libs.androidx.tiles.testing)
@@ -69,7 +70,8 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.compose.material)
+    implementation(libs.wear.compose.material)
+    implementation(libs.wear.compose.material3)
     implementation(libs.compose.foundation)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.core.splashscreen)

wear/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
             android:value="true" />
 
         <activity
-            android:name=".snippets.MainActivity"
+            android:name=".snippets.m3.MainActivity"
             android:exported="true"
             android:taskAffinity=""
             android:theme="@android:style/Theme.DeviceDefault">
@@ -52,6 +52,23 @@
         </service>
         <!-- [END android_wear_tile_manifest] -->
 
+        <!-- [START android_wear_m3_tile_manifest] -->
+        <service
+            android:name=".snippets.m3.tile.MyTileService"
+            android:label="@string/tile_label"
+            android:description="@string/tile_description"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:permission="com.google.android.wearable.permission.BIND_TILE_PROVIDER">
+            <intent-filter>
+                <action android:name="androidx.wear.tiles.action.BIND_TILE_PROVIDER" />
+            </intent-filter>
+
+            <meta-data android:name="androidx.wear.tiles.PREVIEW"
+                android:resource="@drawable/tile_preview" />
+        </service>
+        <!-- [END android_wear_m3_tile_manifest] -->
+
     </application>
 
 </manifest>

wear/src/main/java/com/example/wear/snippets/m3/MainActivity.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.wear.snippets.m3
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.Composable
+import com.example.wear.snippets.m3.list.ComposeList
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            WearApp()
+        }
+    }
+}
+
+@Composable
+fun WearApp() {
+    // insert here the snippet you want to test
+    ComposeList()
+}