Merge branch 'main' into tooltip

Author: jakeroseman

gradle/libs.versions.toml

@@ -1,30 +1,30 @@
 [versions]
 accompanist = "0.36.0"
-androidGradlePlugin = "8.8.0"
+androidGradlePlugin = "8.8.1"
 androidx-activity-compose = "1.10.0"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2025.01.01"
+androidx-compose-bom = "2025.02.00"
 androidx-compose-ui-test = "1.7.0-alpha08"
 androidx-constraintlayout = "2.2.0"
 androidx-constraintlayout-compose = "1.1.0"
 androidx-coordinator-layout = "1.2.0"
 androidx-corektx = "1.15.0"
 androidx-emoji2-views = "1.5.0"
-androidx-fragment-ktx = "1.8.5"
+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.6"
-androidx-paging = "3.3.5"
+androidx-navigation = "2.8.7"
+androidx-paging = "3.3.6"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
-androidx-window = "1.4.0-beta01"
+androidx-window = "1.4.0-beta02"
 androidxHiltNavigationCompose = "1.2.0"
 coil = "2.7.0"
 # @keep
 compileSdk = "35"
-compose-latest = "1.7.7"
-composeUiTooling = "1.4.0"
+compose-latest = "1.7.8"
+composeUiTooling = "1.4.1"
 coreSplashscreen = "1.0.1"
 coroutines = "1.10.1"
 glide = "1.0.0-beta01"
@@ -36,30 +36,24 @@ horologist = "0.6.22"
 junit = "4.13.2"
 kotlin = "2.1.10"
 kotlinxSerializationJson = "1.8.0"
-ksp = "2.1.10-1.0.29"
-maps-compose = "6.4.2"
+ksp = "2.1.10-1.0.30"
+maps-compose = "6.4.4"
 material = "1.13.0-alpha10"
 material3-adaptive = "1.0.0"
 material3-adaptive-navigation-suite = "1.3.1"
 media3 = "1.5.1"
 # @keep
 minSdk = "21"
 playServicesWearable = "19.0.0"
-protolayout = "1.3.0-alpha07"
-protolayoutExpression = "1.3.0-alpha07"
-protolayoutMaterial = "1.3.0-alpha07"
+protolayout = "1.2.1"
 recyclerview = "1.4.0"
 # @keep
 targetSdk = "34"
-tiles = "1.5.0-alpha07"
-tilesRenderer = "1.5.0-alpha07"
-tilesTesting = "1.5.0-alpha07"
-tilesTooling = "1.5.0-alpha07"
-tilesToolingPreview = "1.5.0-alpha07"
+tiles = "1.4.1"
 version-catalog-update = "0.8.5"
 wear = "1.3.0"
-wearComposeFoundation = "1.4.0"
-wearComposeMaterial = "1.4.0"
+wearComposeFoundation = "1.4.1"
+wearComposeMaterial = "1.4.1"
 wearToolingPreview = "1.0.0"
 
 [libraries]
@@ -115,17 +109,17 @@ androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", versi
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
 androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", version.ref = "protolayout" }
-androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayoutExpression" }
-androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayoutMaterial" }
+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-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-runner = "androidx.test:runner:1.6.2"
 androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
-androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tilesRenderer" }
-androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tilesTesting" }
-androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tilesTooling" }
-androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tilesToolingPreview" }
+androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tiles" }
+androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tiles" }
+androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles" }
+androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
 androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
 androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreview" }
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }