Skip to content

Commit c3ac329

Browse files
authored
Merge pull request #1755 from android/renovate/all
Update all dependencies
2 parents 8f196e1 + 5820b0e commit c3ac329

File tree

5 files changed

+116
-113
lines changed

5 files changed

+116
-113
lines changed

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@ androidx.browser:browser:1.8.0
1212
androidx.collection:collection-jvm:1.4.4
1313
androidx.collection:collection-ktx:1.4.4
1414
androidx.collection:collection:1.4.4
15-
androidx.compose.animation:animation-android:1.7.5
16-
androidx.compose.animation:animation-core-android:1.7.5
17-
androidx.compose.animation:animation-core:1.7.5
18-
androidx.compose.animation:animation:1.7.5
19-
androidx.compose.foundation:foundation-android:1.7.5
20-
androidx.compose.foundation:foundation-layout-android:1.7.5
21-
androidx.compose.foundation:foundation-layout:1.7.5
22-
androidx.compose.foundation:foundation:1.7.5
15+
androidx.compose.animation:animation-android:1.7.6
16+
androidx.compose.animation:animation-core-android:1.7.6
17+
androidx.compose.animation:animation-core:1.7.6
18+
androidx.compose.animation:animation:1.7.6
19+
androidx.compose.foundation:foundation-android:1.7.6
20+
androidx.compose.foundation:foundation-layout-android:1.7.6
21+
androidx.compose.foundation:foundation-layout:1.7.6
22+
androidx.compose.foundation:foundation:1.7.6
2323
androidx.compose.material3.adaptive:adaptive-android:1.0.0
2424
androidx.compose.material3.adaptive:adaptive:1.0.0
2525
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
2626
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
2727
androidx.compose.material3:material3-android:1.3.1
2828
androidx.compose.material3:material3:1.3.1
29-
androidx.compose.material:material-icons-core-android:1.7.5
30-
androidx.compose.material:material-icons-core:1.7.5
31-
androidx.compose.material:material-icons-extended-android:1.7.5
32-
androidx.compose.material:material-icons-extended:1.7.5
33-
androidx.compose.material:material-ripple-android:1.7.5
34-
androidx.compose.material:material-ripple:1.7.5
35-
androidx.compose.runtime:runtime-android:1.7.5
36-
androidx.compose.runtime:runtime-saveable-android:1.7.5
37-
androidx.compose.runtime:runtime-saveable:1.7.5
38-
androidx.compose.runtime:runtime:1.7.5
39-
androidx.compose.ui:ui-android:1.7.5
40-
androidx.compose.ui:ui-geometry-android:1.7.5
41-
androidx.compose.ui:ui-geometry:1.7.5
42-
androidx.compose.ui:ui-graphics-android:1.7.5
43-
androidx.compose.ui:ui-graphics:1.7.5
44-
androidx.compose.ui:ui-text-android:1.7.5
45-
androidx.compose.ui:ui-text:1.7.5
46-
androidx.compose.ui:ui-tooling-preview-android:1.7.5
47-
androidx.compose.ui:ui-tooling-preview:1.7.5
48-
androidx.compose.ui:ui-unit-android:1.7.5
49-
androidx.compose.ui:ui-unit:1.7.5
50-
androidx.compose.ui:ui-util-android:1.7.5
51-
androidx.compose.ui:ui-util:1.7.5
52-
androidx.compose.ui:ui:1.7.5
53-
androidx.compose:compose-bom:2024.11.00
29+
androidx.compose.material:material-icons-core-android:1.7.6
30+
androidx.compose.material:material-icons-core:1.7.6
31+
androidx.compose.material:material-icons-extended-android:1.7.6
32+
androidx.compose.material:material-icons-extended:1.7.6
33+
androidx.compose.material:material-ripple-android:1.7.6
34+
androidx.compose.material:material-ripple:1.7.6
35+
androidx.compose.runtime:runtime-android:1.7.6
36+
androidx.compose.runtime:runtime-saveable-android:1.7.6
37+
androidx.compose.runtime:runtime-saveable:1.7.6
38+
androidx.compose.runtime:runtime:1.7.6
39+
androidx.compose.ui:ui-android:1.7.6
40+
androidx.compose.ui:ui-geometry-android:1.7.6
41+
androidx.compose.ui:ui-geometry:1.7.6
42+
androidx.compose.ui:ui-graphics-android:1.7.6
43+
androidx.compose.ui:ui-graphics:1.7.6
44+
androidx.compose.ui:ui-text-android:1.7.6
45+
androidx.compose.ui:ui-text:1.7.6
46+
androidx.compose.ui:ui-tooling-preview-android:1.7.6
47+
androidx.compose.ui:ui-tooling-preview:1.7.6
48+
androidx.compose.ui:ui-unit-android:1.7.6
49+
androidx.compose.ui:ui-unit:1.7.6
50+
androidx.compose.ui:ui-util-android:1.7.6
51+
androidx.compose.ui:ui-util:1.7.6
52+
androidx.compose.ui:ui:1.7.6
53+
androidx.compose:compose-bom:2024.12.01
5454
androidx.concurrent:concurrent-futures:1.1.0
5555
androidx.core:core-ktx:1.13.1
5656
androidx.core:core:1.13.1
@@ -96,10 +96,10 @@ androidx.window:window-core:1.3.0
9696
androidx.window:window:1.3.0
9797
com.google.accompanist:accompanist-drawablepainter:0.32.0
9898
com.google.code.findbugs:jsr305:3.0.2
99-
com.google.dagger:dagger-lint-aar:2.52
100-
com.google.dagger:dagger:2.52
101-
com.google.dagger:hilt-android:2.52
102-
com.google.dagger:hilt-core:2.52
99+
com.google.dagger:dagger-lint-aar:2.53.1
100+
com.google.dagger:dagger:2.53.1
101+
com.google.dagger:hilt-android:2.53.1
102+
com.google.dagger:hilt-core:2.53.1
103103
com.google.guava:listenablefuture:1.0
104104
com.squareup.okhttp3:okhttp:4.12.0
105105
com.squareup.okio:okio-jvm:3.9.0
@@ -110,14 +110,15 @@ io.coil-kt:coil-compose:2.7.0
110110
io.coil-kt:coil:2.7.0
111111
jakarta.inject:jakarta.inject-api:2.0.1
112112
javax.inject:javax.inject:1
113-
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
113+
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
114114
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
115115
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
116-
org.jetbrains.kotlin:kotlin-stdlib:2.0.20
116+
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
117117
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
118118
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
119119
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
120120
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
121121
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
122122
org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
123123
org.jetbrains:annotations:23.0.0
124+
org.jspecify:jspecify:1.0.0

app/dependencies/prodReleaseRuntimeClasspath.txt

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ androidx.browser:browser:1.8.0
1313
androidx.collection:collection-jvm:1.4.4
1414
androidx.collection:collection-ktx:1.4.4
1515
androidx.collection:collection:1.4.4
16-
androidx.compose.animation:animation-android:1.7.5
17-
androidx.compose.animation:animation-core-android:1.7.5
18-
androidx.compose.animation:animation-core:1.7.5
19-
androidx.compose.animation:animation:1.7.5
20-
androidx.compose.foundation:foundation-android:1.7.5
21-
androidx.compose.foundation:foundation-layout-android:1.7.5
22-
androidx.compose.foundation:foundation-layout:1.7.5
23-
androidx.compose.foundation:foundation:1.7.5
16+
androidx.compose.animation:animation-android:1.7.6
17+
androidx.compose.animation:animation-core-android:1.7.6
18+
androidx.compose.animation:animation-core:1.7.6
19+
androidx.compose.animation:animation:1.7.6
20+
androidx.compose.foundation:foundation-android:1.7.6
21+
androidx.compose.foundation:foundation-layout-android:1.7.6
22+
androidx.compose.foundation:foundation-layout:1.7.6
23+
androidx.compose.foundation:foundation:1.7.6
2424
androidx.compose.material3.adaptive:adaptive-android:1.0.0
2525
androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0
2626
androidx.compose.material3.adaptive:adaptive-layout:1.0.0
@@ -33,36 +33,37 @@ androidx.compose.material3:material3-android:1.3.1
3333
androidx.compose.material3:material3-window-size-class-android:1.3.1
3434
androidx.compose.material3:material3-window-size-class:1.3.1
3535
androidx.compose.material3:material3:1.3.1
36-
androidx.compose.material:material-icons-core-android:1.7.5
37-
androidx.compose.material:material-icons-core:1.7.5
38-
androidx.compose.material:material-icons-extended-android:1.7.5
39-
androidx.compose.material:material-icons-extended:1.7.5
40-
androidx.compose.material:material-ripple-android:1.7.5
41-
androidx.compose.material:material-ripple:1.7.5
42-
androidx.compose.runtime:runtime-android:1.7.5
43-
androidx.compose.runtime:runtime-saveable-android:1.7.5
44-
androidx.compose.runtime:runtime-saveable:1.7.5
45-
androidx.compose.runtime:runtime-tracing:1.7.5
46-
androidx.compose.runtime:runtime:1.7.5
47-
androidx.compose.ui:ui-android:1.7.5
48-
androidx.compose.ui:ui-geometry-android:1.7.5
49-
androidx.compose.ui:ui-geometry:1.7.5
50-
androidx.compose.ui:ui-graphics-android:1.7.5
51-
androidx.compose.ui:ui-graphics:1.7.5
52-
androidx.compose.ui:ui-text-android:1.7.5
53-
androidx.compose.ui:ui-text:1.7.5
54-
androidx.compose.ui:ui-tooling-preview-android:1.7.5
55-
androidx.compose.ui:ui-tooling-preview:1.7.5
56-
androidx.compose.ui:ui-unit-android:1.7.5
57-
androidx.compose.ui:ui-unit:1.7.5
58-
androidx.compose.ui:ui-util-android:1.7.5
59-
androidx.compose.ui:ui-util:1.7.5
60-
androidx.compose.ui:ui:1.7.5
61-
androidx.compose:compose-bom:2024.11.00
36+
androidx.compose.material:material-icons-core-android:1.7.6
37+
androidx.compose.material:material-icons-core:1.7.6
38+
androidx.compose.material:material-icons-extended-android:1.7.6
39+
androidx.compose.material:material-icons-extended:1.7.6
40+
androidx.compose.material:material-ripple-android:1.7.6
41+
androidx.compose.material:material-ripple:1.7.6
42+
androidx.compose.runtime:runtime-android:1.7.6
43+
androidx.compose.runtime:runtime-saveable-android:1.7.6
44+
androidx.compose.runtime:runtime-saveable:1.7.6
45+
androidx.compose.runtime:runtime-tracing:1.7.6
46+
androidx.compose.runtime:runtime:1.7.6
47+
androidx.compose.ui:ui-android:1.7.6
48+
androidx.compose.ui:ui-geometry-android:1.7.6
49+
androidx.compose.ui:ui-geometry:1.7.6
50+
androidx.compose.ui:ui-graphics-android:1.7.6
51+
androidx.compose.ui:ui-graphics:1.7.6
52+
androidx.compose.ui:ui-text-android:1.7.6
53+
androidx.compose.ui:ui-text:1.7.6
54+
androidx.compose.ui:ui-tooling-preview-android:1.7.6
55+
androidx.compose.ui:ui-tooling-preview:1.7.6
56+
androidx.compose.ui:ui-unit-android:1.7.6
57+
androidx.compose.ui:ui-unit:1.7.6
58+
androidx.compose.ui:ui-util-android:1.7.6
59+
androidx.compose.ui:ui-util:1.7.6
60+
androidx.compose.ui:ui:1.7.6
61+
androidx.compose:compose-bom:2024.12.01
62+
androidx.concurrent:concurrent-futures-ktx:1.1.0
6263
androidx.concurrent:concurrent-futures:1.1.0
63-
androidx.core:core-ktx:1.13.1
64+
androidx.core:core-ktx:1.15.0
6465
androidx.core:core-splashscreen:1.0.1
65-
androidx.core:core:1.13.1
66+
androidx.core:core:1.15.0
6667
androidx.cursoradapter:cursoradapter:1.0.0
6768
androidx.customview:customview-poolingcontainer:1.0.0
6869
androidx.customview:customview:1.0.0
@@ -112,11 +113,11 @@ androidx.lifecycle:lifecycle-viewmodel:2.8.7
112113
androidx.loader:loader:1.0.0
113114
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
114115
androidx.metrics:metrics-performance:1.0.0-beta01
115-
androidx.navigation:navigation-common-ktx:2.8.4
116-
androidx.navigation:navigation-common:2.8.4
117-
androidx.navigation:navigation-compose:2.8.4
118-
androidx.navigation:navigation-runtime-ktx:2.8.4
119-
androidx.navigation:navigation-runtime:2.8.4
116+
androidx.navigation:navigation-common-ktx:2.8.5
117+
androidx.navigation:navigation-common:2.8.5
118+
androidx.navigation:navigation-compose:2.8.5
119+
androidx.navigation:navigation-runtime-ktx:2.8.5
120+
androidx.navigation:navigation-runtime:2.8.5
120121
androidx.print:print:1.0.0
121122
androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
122123
androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
@@ -141,11 +142,11 @@ androidx.window.extensions.core:core:1.0.0
141142
androidx.window:window-core-android:1.3.0
142143
androidx.window:window-core:1.3.0
143144
androidx.window:window:1.3.0
144-
androidx.work:work-runtime-ktx:2.9.1
145-
androidx.work:work-runtime:2.9.1
145+
androidx.work:work-runtime-ktx:2.10.0
146+
androidx.work:work-runtime:2.10.0
146147
com.caverock:androidsvg-aar:1.4
147148
com.google.accompanist:accompanist-drawablepainter:0.32.0
148-
com.google.accompanist:accompanist-permissions:0.36.0
149+
com.google.accompanist:accompanist-permissions:0.37.0
149150
com.google.android.datatransport:transport-api:3.2.0
150151
com.google.android.datatransport:transport-backend-cct:3.3.0
151152
com.google.android.datatransport:transport-runtime:3.3.0
@@ -163,10 +164,10 @@ com.google.android.gms:play-services-oss-licenses:17.1.0
163164
com.google.android.gms:play-services-stats:17.0.2
164165
com.google.android.gms:play-services-tasks:18.2.0
165166
com.google.code.findbugs:jsr305:3.0.2
166-
com.google.dagger:dagger-lint-aar:2.52
167-
com.google.dagger:dagger:2.52
168-
com.google.dagger:hilt-android:2.52
169-
com.google.dagger:hilt-core:2.52
167+
com.google.dagger:dagger-lint-aar:2.53.1
168+
com.google.dagger:dagger:2.53.1
169+
com.google.dagger:hilt-android:2.53.1
170+
com.google.dagger:hilt-core:2.53.1
170171
com.google.errorprone:error_prone_annotations:2.26.0
171172
com.google.firebase:firebase-abt:21.1.1
172173
com.google.firebase:firebase-analytics:22.1.2
@@ -193,8 +194,8 @@ com.google.guava:failureaccess:1.0.1
193194
com.google.guava:guava:31.1-android
194195
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
195196
com.google.j2objc:j2objc-annotations:1.3
196-
com.google.protobuf:protobuf-javalite:4.28.2
197-
com.google.protobuf:protobuf-kotlin-lite:4.28.2
197+
com.google.protobuf:protobuf-javalite:4.29.1
198+
com.google.protobuf:protobuf-kotlin-lite:4.29.1
198199
com.squareup.okhttp3:logging-interceptor:4.12.0
199200
com.squareup.okhttp3:okhttp:4.12.0
200201
com.squareup.okio:okio-jvm:3.9.0
@@ -211,10 +212,10 @@ javax.inject:javax.inject:1
211212
org.checkerframework:checker-qual:3.12.0
212213
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
213214
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
214-
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
215+
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
215216
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
216217
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
217-
org.jetbrains.kotlin:kotlin-stdlib:2.0.20
218+
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
218219
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
219220
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
220221
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
@@ -223,9 +224,10 @@ org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.9.0
223224
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.9.0
224225
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
225226
org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
226-
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
227-
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
228-
org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
229-
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
230-
org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
227+
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
228+
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
229+
org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
230+
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
231+
org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
231232
org.jetbrains:annotations:23.0.0
233+
org.jspecify:jspecify:1.0.0

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
2-
accompanist = "0.36.0"
2+
accompanist = "0.37.0"
33
androidDesugarJdkLibs = "2.1.3"
44
# AGP and tools should be updated together
5-
androidGradlePlugin = "8.6.1"
5+
androidGradlePlugin = "8.7.3"
66
androidTools = "31.7.3"
77
androidxActivity = "1.9.3"
88
androidxAppCompat = "1.7.0"
99
androidxBrowser = "1.8.0"
10-
androidxComposeBom = "2024.11.00"
11-
androidxComposeRuntimeTracing = "1.7.5"
12-
androidxCore = "1.13.1"
10+
androidxComposeBom = "2024.12.01"
11+
androidxComposeRuntimeTracing = "1.7.6"
12+
androidxCore = "1.15.0"
1313
androidxCoreSplashscreen = "1.0.1"
1414
androidxDataStore = "1.1.1"
1515
androidxEspresso = "3.6.1"
1616
androidxHiltNavigationCompose = "1.2.0"
1717
androidxLifecycle = "2.8.7"
1818
androidxMacroBenchmark = "1.3.3"
1919
androidxMetrics = "1.0.0-beta01"
20-
androidxNavigation = "2.8.4"
20+
androidxNavigation = "2.8.5"
2121
androidxProfileinstaller = "1.4.1"
2222
androidxTestCore = "1.6.1"
2323
androidxTestExt = "1.2.1"
@@ -26,7 +26,7 @@ androidxTestRunner = "1.6.2"
2626
androidxTracing = "1.3.0-alpha02"
2727
androidxUiAutomator = "2.3.0"
2828
androidxWindowManager = "1.3.0"
29-
androidxWork = "2.9.1"
29+
androidxWork = "2.10.0"
3030
coil = "2.7.0"
3131
dependencyGuard = "0.5.0"
3232
firebaseBom = "33.7.0"
@@ -35,27 +35,27 @@ firebasePerfPlugin = "1.4.2"
3535
gmsPlugin = "4.4.2"
3636
googleOss = "17.1.0"
3737
googleOssPlugin = "0.10.6"
38-
hilt = "2.52"
38+
hilt = "2.53.1"
3939
hiltExt = "1.2.0"
4040
jacoco = "0.8.12"
4141
junit4 = "4.13.2"
42-
kotlin = "2.0.20"
42+
kotlin = "2.1.0"
4343
kotlinxCoroutines = "1.9.0"
4444
kotlinxDatetime = "0.6.1"
45-
kotlinxSerializationJson = "1.6.3"
46-
ksp = "2.0.20-1.0.25"
45+
kotlinxSerializationJson = "1.7.3"
46+
ksp = "2.1.0-1.0.29"
4747
moduleGraph = "2.7.1"
4848
okhttp = "4.12.0"
49-
protobuf = "4.28.2"
49+
protobuf = "4.29.1"
5050
protobufPlugin = "0.9.4"
5151
retrofit = "2.11.0"
5252
retrofitKotlinxSerializationJson = "1.0.0"
5353
robolectric = "4.14.1"
54-
roborazzi = "1.36.0"
54+
roborazzi = "1.37.0"
5555
room = "2.6.1"
5656
secrets = "2.0.1"
5757
truth = "1.4.4"
58-
turbine = "1.1.0"
58+
turbine = "1.2.0"
5959

6060
[bundles]
6161
androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"]

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

sync/work/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ class SyncWorkerTest {
6464
val preRunWorkInfo = workManager.getWorkInfoById(request.id).get()
6565

6666
// Assert
67-
assertEquals(WorkInfo.State.ENQUEUED, preRunWorkInfo.state)
67+
assertEquals(WorkInfo.State.ENQUEUED, preRunWorkInfo?.state)
6868

6969
// Tells the testing framework that the constraints have been met
7070
testDriver.setAllConstraintsMet(request.id)
7171

7272
val postRequirementWorkInfo = workManager.getWorkInfoById(request.id).get()
73-
assertEquals(WorkInfo.State.RUNNING, postRequirementWorkInfo.state)
73+
assertEquals(WorkInfo.State.RUNNING, postRequirementWorkInfo?.state)
7474
}
7575
}

0 commit comments

Comments
 (0)