Skip to content

Commit 540edcb

Browse files
Update androidx library versions
1 parent 74635d9 commit 540edcb

File tree

10 files changed

+92
-47
lines changed

10 files changed

+92
-47
lines changed

dependencies/classpath.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ com.android.tools:sdk-common:31.1.2
4141
com.android.tools:sdklib:31.1.2
4242
com.android:signflinger:8.1.2
4343
com.android:zipflinger:8.1.2
44-
com.dropbox.dependency-guard:dependency-guard:0.4.3
44+
com.dropbox.dependency-guard:dependency-guard:0.5.0
4545
com.fasterxml.jackson.core:jackson-annotations:2.12.7
4646
com.fasterxml.jackson.core:jackson-core:2.12.7
4747
com.fasterxml.jackson.core:jackson-databind:2.12.7.1

gradle/libs.versions.toml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22

3-
androidTools = "8.1.2"
3+
agpVersion = "8.1.2"
44

55
compileSdk = "34"
66
minSdk = "24"
@@ -9,36 +9,37 @@ targetSdk = "33"
99
jdk-target = "1.8"
1010
jdk-toolchain = "17"
1111

12-
androidx-activity = "1.6.1"
13-
androidx-appcompat = "1.6.1"
14-
androidx-benchmark = "1.2.3"
12+
androidx-activity = "1.8.2"
13+
androidx-appcompat = "1.7.0"
14+
androidx-benchmark = "1.3.3"
1515
androidx-cardview = "1.0.0"
1616
androidx-compose-compiler = "1.5.14"
1717
# see https://developer.android.com/jetpack/compose/bom/bom-mapping
1818
androidx-compose-bom = "2024.09.02"
1919
androidx-constraintlayout = "2.1.4"
20-
androidx-core = "1.12.0"
21-
androidx-fragment = "1.3.6"
20+
androidx-core = "1.13.1"
21+
androidx-fragment = "1.8.5"
2222
androidx-gridlayout = "1.0.0"
2323
androidx-lifecycle = "2.8.7"
24-
androidx-navigation = "2.4.0-alpha09"
24+
androidx-navigation = "2.8.4"
2525
androidx-paging = "3.0.1"
2626
androidx-profileinstaller = "1.2.0-alpha02"
2727
androidx-recyclerview = "1.3.2"
2828
androidx-room = "2.4.0-alpha04"
2929
androidx-savedstate = "1.2.1"
3030
androidx-startup = "1.1.0"
31-
androidx-test = "1.5.0"
31+
androidx-test = "1.6.1"
3232
androidx-test-espresso = "3.5.1"
3333
androidx-test-junit-ext = "1.1.5"
3434
androidx-test-runner = "1.5.2"
3535
androidx-test-truth-ext = "1.5.0"
36-
androidx-tracing = "1.1.0"
37-
androidx-transition = "1.4.1"
36+
androidx-tracing = "1.2.0"
37+
androidx-transition = "1.5.1"
38+
androidx-viewbinding = "8.1.2"
3839

3940
detekt = "1.19.0"
4041
dokka = "1.9.10"
41-
dependencyGuard = "0.4.3"
42+
dependencyGuard = "0.5.0"
4243

4344
google-accompanist = "0.18.0"
4445
google-dagger = "2.40.5"
@@ -75,7 +76,7 @@ rxjava2-core = "2.2.21"
7576

7677
squareup-curtains = "1.2.5"
7778
squareup-cycler = "0.1.9"
78-
squareup-leakcanary = "2.12"
79+
squareup-leakcanary = "3.0-alpha-8"
7980
squareup-moshi = "1.15.0"
8081
squareup-okhttp = "4.9.1"
8182
squareup-okio = "3.3.0"
@@ -85,7 +86,7 @@ squareup-seismic = "1.0.3"
8586
squareup-workflow = "1.0.0"
8687

8788
timber = "5.0.1"
88-
truth = "1.1.5"
89+
truth = "1.4.4"
8990
turbine = "1.0.0"
9091
vanniktech-publish = "0.27.0"
9192

@@ -106,7 +107,7 @@ mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-
106107

107108
[libraries]
108109

109-
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidTools" }
110+
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agpVersion" }
110111

111112
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
112113
androidx-activity-core = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
@@ -176,7 +177,7 @@ androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref =
176177

177178
androidx-transition = { module = "androidx.transition:transition", version.ref = "androidx-transition" }
178179

179-
androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "androidTools" }
180+
androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "androidx-viewbinding" }
180181

181182
dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
182183

workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
androidx.activity:activity-compose:1.7.0
2-
androidx.activity:activity-ktx:1.7.0
3-
androidx.activity:activity:1.7.0
1+
androidx.activity:activity-compose:1.8.2
2+
androidx.activity:activity-ktx:1.8.2
3+
androidx.activity:activity:1.8.2
44
androidx.annotation:annotation-experimental:1.4.1
55
androidx.annotation:annotation-jvm:1.8.1
66
androidx.annotation:annotation:1.8.1
@@ -41,12 +41,17 @@ androidx.concurrent:concurrent-futures:1.1.0
4141
androidx.core:core-ktx:1.13.1
4242
androidx.core:core:1.13.1
4343
androidx.customview:customview-poolingcontainer:1.0.0
44+
androidx.documentfile:documentfile:1.0.0
45+
androidx.dynamicanimation:dynamicanimation:1.0.0
4446
androidx.emoji2:emoji2:1.3.0
4547
androidx.graphics:graphics-path:1.0.1
4648
androidx.interpolator:interpolator:1.0.0
49+
androidx.legacy:legacy-support-core-utils:1.0.0
4750
androidx.lifecycle:lifecycle-common-jvm:2.8.7
4851
androidx.lifecycle:lifecycle-common:2.8.7
52+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
4953
androidx.lifecycle:lifecycle-livedata-core:2.8.7
54+
androidx.lifecycle:lifecycle-livedata:2.8.7
5055
androidx.lifecycle:lifecycle-process:2.8.7
5156
androidx.lifecycle:lifecycle-runtime-android:2.8.7
5257
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
@@ -58,12 +63,15 @@ androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
5863
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
5964
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
6065
androidx.lifecycle:lifecycle-viewmodel:2.8.7
66+
androidx.loader:loader:1.0.0
67+
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
68+
androidx.print:print:1.0.0
6169
androidx.profileinstaller:profileinstaller:1.3.1
6270
androidx.savedstate:savedstate-ktx:1.2.1
6371
androidx.savedstate:savedstate:1.2.1
6472
androidx.startup:startup-runtime:1.1.1
6573
androidx.tracing:tracing:1.0.0
66-
androidx.transition:transition:1.4.1
74+
androidx.transition:transition:1.5.1
6775
androidx.versionedparcelable:versionedparcelable:1.1.1
6876
com.google.guava:listenablefuture:1.0
6977
com.squareup.okio:okio-jvm:3.3.0

workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
androidx.activity:activity-compose:1.7.0
2-
androidx.activity:activity-ktx:1.7.0
3-
androidx.activity:activity:1.7.0
1+
androidx.activity:activity-compose:1.8.2
2+
androidx.activity:activity-ktx:1.8.2
3+
androidx.activity:activity:1.8.2
44
androidx.annotation:annotation-experimental:1.4.1
55
androidx.annotation:annotation-jvm:1.8.1
66
androidx.annotation:annotation:1.8.1
@@ -32,15 +32,20 @@ androidx.compose.ui:ui-util:1.7.2
3232
androidx.compose.ui:ui:1.7.2
3333
androidx.compose:compose-bom:2024.09.02
3434
androidx.concurrent:concurrent-futures:1.1.0
35-
androidx.core:core-ktx:1.12.0
36-
androidx.core:core:1.12.0
35+
androidx.core:core-ktx:1.13.1
36+
androidx.core:core:1.13.1
3737
androidx.customview:customview-poolingcontainer:1.0.0
38+
androidx.documentfile:documentfile:1.0.0
39+
androidx.dynamicanimation:dynamicanimation:1.0.0
3840
androidx.emoji2:emoji2:1.2.0
3941
androidx.graphics:graphics-path:1.0.1
4042
androidx.interpolator:interpolator:1.0.0
43+
androidx.legacy:legacy-support-core-utils:1.0.0
4144
androidx.lifecycle:lifecycle-common-jvm:2.8.7
4245
androidx.lifecycle:lifecycle-common:2.8.7
46+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
4347
androidx.lifecycle:lifecycle-livedata-core:2.8.7
48+
androidx.lifecycle:lifecycle-livedata:2.8.7
4449
androidx.lifecycle:lifecycle-process:2.8.7
4550
androidx.lifecycle:lifecycle-runtime-android:2.8.7
4651
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
@@ -52,12 +57,15 @@ androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
5257
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
5358
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
5459
androidx.lifecycle:lifecycle-viewmodel:2.8.7
60+
androidx.loader:loader:1.0.0
61+
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
62+
androidx.print:print:1.0.0
5563
androidx.profileinstaller:profileinstaller:1.3.1
5664
androidx.savedstate:savedstate-ktx:1.2.1
5765
androidx.savedstate:savedstate:1.2.1
5866
androidx.startup:startup-runtime:1.1.1
5967
androidx.tracing:tracing:1.0.0
60-
androidx.transition:transition:1.4.1
68+
androidx.transition:transition:1.5.1
6169
androidx.versionedparcelable:versionedparcelable:1.1.1
6270
com.google.guava:listenablefuture:1.0
6371
com.squareup.okio:okio-jvm:3.3.0

workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
1-
androidx.activity:activity:1.6.1
2-
androidx.annotation:annotation-experimental:1.3.0
1+
androidx.activity:activity:1.8.2
2+
androidx.annotation:annotation-experimental:1.4.0
33
androidx.annotation:annotation-jvm:1.8.1
44
androidx.annotation:annotation:1.8.1
55
androidx.arch.core:core-common:2.2.0
66
androidx.arch.core:core-runtime:2.2.0
77
androidx.collection:collection:1.1.0
88
androidx.concurrent:concurrent-futures:1.1.0
9-
androidx.core:core-ktx:1.12.0
10-
androidx.core:core:1.12.0
9+
androidx.core:core-ktx:1.13.1
10+
androidx.core:core:1.13.1
11+
androidx.documentfile:documentfile:1.0.0
12+
androidx.dynamicanimation:dynamicanimation:1.0.0
1113
androidx.interpolator:interpolator:1.0.0
14+
androidx.legacy:legacy-support-core-utils:1.0.0
1215
androidx.lifecycle:lifecycle-common-jvm:2.8.7
1316
androidx.lifecycle:lifecycle-common:2.8.7
17+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
1418
androidx.lifecycle:lifecycle-livedata-core:2.8.7
19+
androidx.lifecycle:lifecycle-livedata:2.8.7
1520
androidx.lifecycle:lifecycle-runtime-android:2.8.7
1621
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
1722
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
1823
androidx.lifecycle:lifecycle-runtime:2.8.7
1924
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
2025
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
2126
androidx.lifecycle:lifecycle-viewmodel:2.8.7
27+
androidx.loader:loader:1.0.0
28+
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
29+
androidx.print:print:1.0.0
2230
androidx.profileinstaller:profileinstaller:1.3.1
2331
androidx.savedstate:savedstate:1.2.1
2432
androidx.startup:startup-runtime:1.1.1
2533
androidx.tracing:tracing:1.0.0
26-
androidx.transition:transition:1.4.1
34+
androidx.transition:transition:1.5.1
2735
androidx.versionedparcelable:versionedparcelable:1.1.1
2836
com.google.guava:listenablefuture:1.0
2937
com.squareup.okio:okio-jvm:3.3.0

workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/navigation/ViewStateCacheTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ internal class ViewStateCacheTest {
3939
override val lifecycle: Lifecycle
4040
get() = error("")
4141

42-
override fun getOnBackPressedDispatcher(): OnBackPressedDispatcher = error("")
42+
override val onBackPressedDispatcher: OnBackPressedDispatcher
43+
get() = error("")
4344
}
4445

4546
private object AScreen : Screen

workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/navigation/DialogSession.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,15 @@ internal class DialogSession(
150150
val onBack = (dialog as? OnBackPressedDispatcherOwner)
151151
?: holder.environment.map[OnBackPressedDispatcherOwnerKey] as? OnBackPressedDispatcherOwner
152152
?: decorView.onBackPressedDispatcherOwnerOrNull()
153-
?: object : OnBackPressedDispatcherOwner {
154-
override val lifecycle: Lifecycle
155-
get() = error("To support back press handling extend ComponentDialog: $dialog")
153+
?: run {
154+
@Suppress("UNREACHABLE_CODE")
155+
object : OnBackPressedDispatcherOwner {
156+
override val lifecycle: Lifecycle
157+
get() = error("To support back press handling extend ComponentDialog: $dialog")
156158

157-
override fun getOnBackPressedDispatcher(): OnBackPressedDispatcher =
158-
error("To support back press handling extend ComponentDialog: $dialog")
159+
override val onBackPressedDispatcher: OnBackPressedDispatcher =
160+
error("To support back press handling extend ComponentDialog: $dialog")
161+
}
159162
}
160163

161164
// Implementations of buildDialog may set their own WorkflowLifecycleOwner on the

workflow-ui/core-android/src/test/java/com/squareup/workflow1/ui/WorkflowLayoutTest.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ internal class WorkflowLayoutTest {
3636
private val workflowLayout = WorkflowLayout(context).apply {
3737
id = 42
3838
setViewTreeOnBackPressedDispatcherOwner(object : OnBackPressedDispatcherOwner {
39-
override fun getOnBackPressedDispatcher(): OnBackPressedDispatcher {
40-
error("yeah no")
41-
}
39+
override val onBackPressedDispatcher: OnBackPressedDispatcher
40+
get() {
41+
error("yeah no")
42+
}
43+
4244
override val lifecycle: Lifecycle get() = error("nope")
4345
})
4446
}
@@ -70,7 +72,10 @@ internal class WorkflowLayoutTest {
7072
}
7173

7274
val onBack = object : OnBackPressedDispatcherOwner {
73-
override fun getOnBackPressedDispatcher() = error("nope")
75+
override val onBackPressedDispatcher: OnBackPressedDispatcher
76+
get() {
77+
error("nope")
78+
}
7479
override val lifecycle: Lifecycle get() = error("also nope")
7580
}
7681

workflow-ui/core-android/src/test/java/com/squareup/workflow1/ui/androidx/WorkflowSavedStateRegistryAggregatorTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ internal class WorkflowSavedStateRegistryAggregatorTest {
2727
private val fakeOnBack = object : OnBackPressedDispatcherOwner {
2828
override val lifecycle: Lifecycle
2929
get() = error("")
30-
override fun getOnBackPressedDispatcher(): OnBackPressedDispatcher = error("")
30+
override val onBackPressedDispatcher: OnBackPressedDispatcher
31+
get() {
32+
error("")
33+
}
3134
}
3235

3336
@Test fun `attach stops observing previous parent when called multiple times without detach`() {

workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
1-
androidx.activity:activity:1.6.1
2-
androidx.annotation:annotation-experimental:1.3.0
1+
androidx.activity:activity:1.8.2
2+
androidx.annotation:annotation-experimental:1.4.0
33
androidx.annotation:annotation-jvm:1.8.1
44
androidx.annotation:annotation:1.8.1
55
androidx.arch.core:core-common:2.2.0
66
androidx.arch.core:core-runtime:2.2.0
77
androidx.collection:collection:1.1.0
88
androidx.concurrent:concurrent-futures:1.1.0
9-
androidx.core:core-ktx:1.12.0
10-
androidx.core:core:1.12.0
9+
androidx.core:core-ktx:1.13.1
10+
androidx.core:core:1.13.1
11+
androidx.documentfile:documentfile:1.0.0
12+
androidx.dynamicanimation:dynamicanimation:1.0.0
1113
androidx.interpolator:interpolator:1.0.0
14+
androidx.legacy:legacy-support-core-utils:1.0.0
1215
androidx.lifecycle:lifecycle-common-jvm:2.8.7
1316
androidx.lifecycle:lifecycle-common:2.8.7
17+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
1418
androidx.lifecycle:lifecycle-livedata-core:2.8.7
19+
androidx.lifecycle:lifecycle-livedata:2.8.7
1520
androidx.lifecycle:lifecycle-runtime-android:2.8.7
1621
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
1722
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
1823
androidx.lifecycle:lifecycle-runtime:2.8.7
1924
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
2025
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
2126
androidx.lifecycle:lifecycle-viewmodel:2.8.7
27+
androidx.loader:loader:1.0.0
28+
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
29+
androidx.print:print:1.0.0
2230
androidx.profileinstaller:profileinstaller:1.3.1
2331
androidx.savedstate:savedstate:1.2.1
2432
androidx.startup:startup-runtime:1.1.1
2533
androidx.tracing:tracing:1.0.0
26-
androidx.transition:transition:1.4.1
34+
androidx.transition:transition:1.5.1
2735
androidx.versionedparcelable:versionedparcelable:1.1.1
2836
com.google.guava:listenablefuture:1.0
2937
com.squareup.curtains:curtains:1.2.2

0 commit comments

Comments
 (0)