Skip to content

Commit c8dc568

Browse files
🤖 Update Dependencies (#723)
* 🤖 Update Dependencies * 1.10 changes. --------- Co-authored-by: Rebecca Franks <[email protected]>
1 parent 83d291d commit c8dc568

File tree

4 files changed

+45
-45
lines changed

4 files changed

+45
-45
lines changed

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/CustomizeSharedElementsSnippets.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private fun MainContent(
135135
animatedVisibilityScope: AnimatedVisibilityScope
136136
) {
137137
with(sharedTransitionScope) {
138-
Box(modifier = Modifier.fillMaxSize()) {
138+
Box(modifier = modifier.fillMaxSize()) {
139139
Row(
140140
modifier = Modifier
141141
.padding(8.dp)
@@ -209,7 +209,7 @@ private fun DetailsContent(
209209
animatedVisibilityScope: AnimatedVisibilityScope
210210
) {
211211
with(sharedTransitionScope) {
212-
Box(modifier = Modifier.fillMaxSize()) {
212+
Box(modifier = modifier.fillMaxSize()) {
213213
Column(
214214
modifier = Modifier
215215
.padding(top = 200.dp, start = 16.dp, end = 16.dp)
@@ -574,7 +574,7 @@ fun PlaceholderSizeAnimated_Demo() {
574574
.sharedBounds(
575575
rememberSharedContentState(key = "image-${snack.name}"),
576576
animatedVisibilityScope = this@composable,
577-
placeHolderSize = SharedTransitionScope.PlaceHolderSize.animatedSize
577+
placeholderSize = SharedTransitionScope.PlaceholderSize.AnimatedSize
578578
)
579579
.clickable {
580580
navController.navigate("details/$index")
@@ -624,7 +624,7 @@ fun PlaceholderSizeAnimated_Demo() {
624624
.sharedBounds(
625625
rememberSharedContentState(key = "image-${snack.name}"),
626626
animatedVisibilityScope = this@composable,
627-
placeHolderSize = SharedTransitionScope.PlaceHolderSize.animatedSize
627+
placeholderSize = SharedTransitionScope.PlaceholderSize.AnimatedSize
628628
)
629629
.clip(RoundedCornerShape(8.dp))
630630
.fillMaxWidth()

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedBoundsSnippets.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private fun MainContent(
102102
animatedVisibilityScope = animatedVisibilityScope,
103103
enter = fadeIn(),
104104
exit = fadeOut(),
105-
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
105+
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
106106
)
107107
// [START_EXCLUDE]
108108
.border(1.dp, Color.Gray.copy(alpha = 0.5f), RoundedCornerShape(8.dp))
@@ -154,7 +154,7 @@ private fun DetailsContent(
154154
animatedVisibilityScope = animatedVisibilityScope,
155155
enter = fadeIn(),
156156
exit = fadeOut(),
157-
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
157+
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
158158
)
159159
// [START_EXCLUDE]
160160
.border(1.dp, Color.Gray.copy(alpha = 0.5f), RoundedCornerShape(8.dp))

compose/snippets/src/main/java/com/example/compose/snippets/animations/sharedelement/SharedElementCommonUseCaseSnippets.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private fun SharedElementTypicalUseText() {
9292
animatedVisibilityScope = this,
9393
enter = fadeIn(),
9494
exit = fadeOut(),
95-
resizeMode = SharedTransitionScope.ResizeMode.ScaleToBounds()
95+
resizeMode = SharedTransitionScope.ResizeMode.scaleToBounds()
9696
)
9797
)
9898
// [END android_compose_shared_element_text_tip]

gradle/libs.versions.toml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
22
accompanist = "0.36.0"
3-
activityKtx = "1.11.0"
3+
activityKtx = "1.12.1"
44
android-googleid = "1.1.1"
5-
androidGradlePlugin = "8.13.0"
6-
androidx-activity-compose = "1.11.0"
5+
androidGradlePlugin = "8.13.1"
6+
androidx-activity-compose = "1.12.1"
77
androidx-appcompat = "1.7.0"
8-
androidx-compose-bom = "2025.11.01"
8+
androidx-compose-bom = "2025.12.00"
99
androidx-compose-ui-test = "1.7.0-alpha08"
10-
androidx-compose-ui-test-junit4-accessibility = "1.10.0-beta01"
10+
androidx-compose-ui-test-junit4-accessibility = "1.11.0-alpha01"
1111
androidx-constraintlayout = "2.2.1"
1212
androidx-constraintlayout-compose = "1.1.1"
1313
androidx-coordinator-layout = "1.3.0"
@@ -17,18 +17,18 @@ androidx-credentials-play-services-auth = "1.6.0-beta03"
1717
androidx-emoji2-views = "1.6.0"
1818
androidx-fragment = "1.8.9"
1919
androidx-glance-appwidget = "1.1.1"
20-
androidx-lifecycle-compose = "2.9.4"
21-
androidx-lifecycle-runtime-compose = "2.9.4"
22-
androidx-navigation = "2.9.5"
23-
androidx-navigation3 = "1.0.0-beta01"
20+
androidx-lifecycle-compose = "2.10.0"
21+
androidx-lifecycle-runtime-compose = "2.10.0"
22+
androidx-navigation = "2.9.6"
23+
androidx-navigation3 = "1.1.0-alpha01"
2424
androidx-paging = "3.3.6"
2525
androidx-startup-runtime = "1.2.0"
2626
androidx-test = "1.7.0"
2727
androidx-test-espresso = "3.7.0"
2828
androidx-test-junit = "1.3.0"
29-
androidx-window = "1.5.0"
30-
androidx-window-core = "1.5.0"
31-
androidx-window-java = "1.5.0"
29+
androidx-window = "1.5.1"
30+
androidx-window-core = "1.5.1"
31+
androidx-window-java = "1.5.1"
3232
androidx-xr-arcore = "1.0.0-alpha09"
3333
androidx-xr-compose = "1.0.0-alpha09"
3434
androidx-xr-scenecore = "1.0.0-alpha10"
@@ -38,59 +38,59 @@ arcorePlayServices = "1.0.0-alpha09"
3838
coil = "2.7.0"
3939
# @keep
4040
compileSdk = "36"
41-
compose-latest = "1.9.5"
42-
composeUiTooling = "1.5.5"
41+
compose-latest = "1.10.0"
42+
composeUiTooling = "1.5.6"
4343
coreSplashscreen = "1.2.0"
4444
coroutines = "1.10.2"
45-
dataStore = "1.1.7"
46-
datastoreCore = "1.1.7"
47-
datastorePreferencesRxjava2 = "1.1.7"
48-
datastorePreferencesRxjava3 = "1.1.7"
49-
firebase-bom = "34.4.0"
45+
dataStore = "1.2.0"
46+
datastoreCore = "1.2.0"
47+
datastorePreferencesRxjava2 = "1.2.0"
48+
datastorePreferencesRxjava3 = "1.2.0"
49+
firebase-bom = "34.6.0"
5050
glide = "1.0.0-beta08"
5151
google-ar-core = "1.51.0"
5252
google-maps = "19.2.0"
5353
gradle-versions = "0.53.0"
5454
guava = "33.5.0-jre"
5555
guava-android = "33.5.0-jre"
5656
hilt = "2.57.2"
57-
horologist = "0.8.2-alpha"
57+
horologist = "0.8.3-alpha"
5858
junit = "4.13.2"
5959
kotlin = "2.2.21"
6060
kotlinCoroutinesOkhttp = "1.0"
6161
kotlinxCoroutinesGuava = "1.10.2"
6262
kotlinxSerializationJson = "1.9.0"
63-
ksp = "2.3.0"
63+
ksp = "2.3.3"
6464
ktlint = "1.5.0"
65-
lifecycleService = "2.9.4"
66-
maps-compose = "6.12.1"
67-
material = "1.14.0-alpha06"
65+
lifecycleService = "2.10.0"
66+
maps-compose = "6.12.2"
67+
material = "1.14.0-alpha07"
6868
material3-adaptive = "1.2.0"
6969
material3-adaptive-navigation-suite = "1.4.0"
7070
media3 = "1.8.0"
7171
media3Ui = "1.8.0"
7272
# @keep
7373
minSdk = "36"
74-
okHttp = "5.2.1"
74+
okHttp = "5.3.2"
7575
playServicesWearable = "19.0.0"
76-
protobuf = "4.32.1"
76+
protobuf = "4.33.1"
7777
protoc = "0.9.5"
7878
protolayout = "1.3.0"
7979
reactive-streams = "1.0.4"
8080
recyclerview = "1.4.0"
8181
robolectric = "4.16"
8282
roborazzi = "1.52.0"
83-
spotless = "8.0.0"
83+
spotless = "8.1.0"
8484
targetSdk = "36"
8585
tiles = "1.5.0"
8686
tracing = "1.3.0"
8787
validatorPush = "1.0.0-alpha08"
8888
version-catalog-update = "1.0.1"
8989
watchfaceComplicationsDataSourceKtx = "1.2.1"
9090
wear = "1.3.0"
91-
wearComposeFoundation = "1.5.5"
92-
wearComposeMaterial = "1.5.5"
93-
wearComposeMaterial3 = "1.5.5"
91+
wearComposeFoundation = "1.5.6"
92+
wearComposeMaterial = "1.5.6"
93+
wearComposeMaterial3 = "1.5.6"
9494
wearInput = "1.2.0"
9595
wearOngoing = "1.1.0"
9696
wearToolingPreview = "1.0.0"
@@ -139,10 +139,10 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
139139
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
140140
androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "androidx-credentials" }
141141
androidx-credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "androidx-credentials-play-services-auth" }
142-
androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "dataStore" }
142+
androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "dataStore" }
143143
androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "datastoreCore" }
144-
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "dataStore" }
145-
androidx-datastore-preferences-core = { group = "androidx.datastore", name = "datastore-preferences-core", version.ref = "dataStore" }
144+
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "dataStore" }
145+
androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "dataStore" }
146146
androidx-datastore-preferences-rxjava2 = { module = "androidx.datastore:datastore-preferences-rxjava2", version.ref = "datastorePreferencesRxjava2" }
147147
androidx-datastore-preferences-rxjava3 = { module = "androidx.datastore:datastore-preferences-rxjava3", version.ref = "datastorePreferencesRxjava3" }
148148
androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref = "androidx-emoji2-views" }
@@ -206,7 +206,7 @@ firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "fir
206206
glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }
207207
google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
208208
google-ar-core = { module = "com.google.ar:core", version.ref = "google-ar-core" }
209-
google-protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
209+
google-protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
210210
googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
211211
googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
212212
guava = { module = "com.google.guava:guava", version.ref = "guava" }
@@ -216,10 +216,6 @@ hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.re
216216
horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
217217
horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
218218
horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
219-
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
220-
roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
221-
roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" }
222-
roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
223219
jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
224220
junit = { module = "junit:junit", version.ref = "junit" }
225221
kotlin-coroutines-okhttp = { module = "ru.gildor.coroutines:kotlin-coroutines-okhttp", version.ref = "kotlinCoroutinesOkhttp" }
@@ -232,6 +228,10 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
232228
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
233229
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
234230
reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactive-streams" }
231+
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
232+
roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }
233+
roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
234+
roborazzi-rule = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" }
235235
validator-push = { module = "com.google.android.wearable.watchface.validator:validator-push", version.ref = "validatorPush" }
236236
wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
237237
wear-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearComposeMaterial3" }

0 commit comments

Comments
 (0)