Skip to content

Commit 859db5d

Browse files
authored
Merge branch 'main' into ro/draganddrop_180
2 parents bbcd2e5 + d2ccac0 commit 859db5d

File tree

1 file changed

+16
-22
lines changed

1 file changed

+16
-22
lines changed

gradle/libs.versions.toml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ accompanist = "0.36.0"
33
androidGradlePlugin = "8.8.0"
44
androidx-activity-compose = "1.10.0"
55
androidx-appcompat = "1.7.0"
6-
androidx-compose-bom = "2025.01.00"
6+
androidx-compose-bom = "2025.01.01"
77
androidx-compose-ui-test = "1.7.0-alpha08"
88
androidx-constraintlayout = "2.2.0"
99
androidx-constraintlayout-compose = "1.1.0"
@@ -14,7 +14,7 @@ androidx-fragment-ktx = "1.8.5"
1414
androidx-glance-appwidget = "1.1.1"
1515
androidx-lifecycle-compose = "2.8.7"
1616
androidx-lifecycle-runtime-compose = "2.8.7"
17-
androidx-navigation = "2.8.5"
17+
androidx-navigation = "2.8.6"
1818
androidx-paging = "3.3.5"
1919
androidx-test = "1.6.1"
2020
androidx-test-espresso = "3.6.1"
@@ -23,39 +23,33 @@ androidxHiltNavigationCompose = "1.2.0"
2323
coil = "2.7.0"
2424
# @keep
2525
compileSdk = "35"
26-
compose-latest = "1.7.6"
26+
compose-latest = "1.7.7"
2727
composeUiTooling = "1.4.0"
2828
coreSplashscreen = "1.0.1"
2929
coroutines = "1.10.1"
3030
glide = "1.0.0-beta01"
3131
google-maps = "19.0.0"
32-
gradle-versions = "0.51.0"
32+
gradle-versions = "0.52.0"
3333
guava = "33.4.0-jre"
3434
hilt = "2.55"
3535
horologist = "0.6.22"
3636
junit = "4.13.2"
37-
kotlin = "2.1.0"
37+
kotlin = "2.1.10"
3838
kotlinxSerializationJson = "1.8.0"
39-
ksp = "2.1.0-1.0.29"
40-
maps-compose = "6.4.1"
41-
material = "1.13.0-alpha09"
39+
ksp = "2.1.10-1.0.29"
40+
maps-compose = "6.4.2"
41+
material = "1.13.0-alpha10"
4242
material3-adaptive = "1.0.0"
4343
material3-adaptive-navigation-suite = "1.3.1"
4444
media3 = "1.5.1"
4545
# @keep
4646
minSdk = "21"
4747
playServicesWearable = "19.0.0"
48-
protolayout = "1.3.0-alpha06"
49-
protolayoutExpression = "1.3.0-alpha06"
50-
protolayoutMaterial = "1.3.0-alpha06"
48+
protolayout = "1.2.1"
5149
recyclerview = "1.4.0"
5250
# @keep
5351
targetSdk = "34"
54-
tiles = "1.5.0-alpha06"
55-
tilesRenderer = "1.5.0-alpha06"
56-
tilesTesting = "1.5.0-alpha06"
57-
tilesTooling = "1.5.0-alpha06"
58-
tilesToolingPreview = "1.5.0-alpha06"
52+
tiles = "1.4.1"
5953
version-catalog-update = "0.8.5"
6054
wear = "1.3.0"
6155
wearComposeFoundation = "1.4.0"
@@ -115,17 +109,17 @@ androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", versi
115109
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
116110
androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
117111
androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", version.ref = "protolayout" }
118-
androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayoutExpression" }
119-
androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayoutMaterial" }
112+
androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
113+
androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
120114
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
121115
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
122116
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
123117
androidx-test-runner = "androidx.test:runner:1.6.2"
124118
androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
125-
androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tilesRenderer" }
126-
androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tilesTesting" }
127-
androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tilesTooling" }
128-
androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tilesToolingPreview" }
119+
androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tiles" }
120+
androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tiles" }
121+
androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles" }
122+
androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
129123
androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
130124
androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreview" }
131125
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }

0 commit comments

Comments
 (0)