Align compose dependencies
Aligning compose dependencies for activity and lifecycle. Making sure
that different dependencies on the atmoic library groups have matching
versions.
This should be done by constraints anyway, but we want to clean it up so
that is clear that library groups will always use the same version.
Test: ./gradlew bOS
Change-Id: I5d1aab603732f982a60f9485da51a1bbea0f1bc7
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 1d95cf2..1ca97a2 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -47,8 +47,8 @@
implementation("androidx.compose.ui:ui-util:1.2.1")
// TODO: remove next 3 dependencies when b/202810604 is fixed
- implementation("androidx.savedstate:savedstate:1.1.0")
- implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
+ implementation("androidx.savedstate:savedstate:1.2.0")
+ implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
testImplementation(libs.testRules)
@@ -106,9 +106,9 @@
api("androidx.annotation:annotation:1.1.0")
// TODO: remove next 3 dependencies when b/202810604 is fixed
- implementation("androidx.savedstate:savedstate:1.1.0")
- implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
- implementation("androidx.lifecycle:lifecycle-viewmodel:2.5.1")
+ implementation("androidx.savedstate:savedstate:1.2.0")
+ implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
+ implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
}
desktopMain.dependencies {
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 7090d9c..f4188d4 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -50,7 +50,7 @@
// TODO: remove next 3 dependencies when b/202810604 is fixed
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
- implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
+ implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
testImplementation(libs.testRules)
@@ -107,9 +107,9 @@
implementation("androidx.activity:activity-compose:1.5.0")
// TODO: remove next 3 dependencies when b/202810604 is fixed
- implementation("androidx.savedstate:savedstate:1.1.0")
- implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
- implementation("androidx.lifecycle:lifecycle-viewmodel:2.5.1")
+ implementation("androidx.savedstate:savedstate-ktx:1.2.0")
+ implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
+ implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
}
desktopMain.dependencies {
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index da290b3..fa9904b 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -38,7 +38,6 @@
api(project(":compose:ui:ui"))
api(project(":compose:ui:ui-tooling-preview"))
api(project(":compose:ui:ui-tooling-data"))
- implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
implementation("androidx.compose.material:material:1.0.0")
implementation("androidx.activity:activity-compose:1.7.0-beta02")
@@ -87,7 +86,6 @@
api("androidx.annotation:annotation:1.1.0")
implementation(project(":compose:animation:animation"))
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
-
implementation(project(":compose:material:material"))
implementation("androidx.activity:activity-compose:1.7.0-beta02")
implementation("androidx.lifecycle:lifecycle-common:2.6.0-rc01")
@@ -105,13 +103,6 @@
androidAndroidTest.dependencies {
implementation(project(":compose:ui:ui-test-junit4"))
- // old version of common-java8 conflicts with newer version, because both have
- // DefaultLifecycleEventObserver.
- // Outside of androidx this is resolved via constraint added to lifecycle-common,
- // but it doesn't work in androidx.
- // See aosp/1804059
- implementation("androidx.lifecycle:lifecycle-common-java8:2.6.0-rc01")
- implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0-rc01")
implementation(libs.junit)
implementation(libs.testRunner)
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 94eb4b9..5dd55a9 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -76,13 +76,11 @@
compileOnly(libs.kotlinReflect)
testImplementation(libs.kotlinReflect)
- implementation("androidx.activity:activity:1.7.0-beta02")
- implementation("androidx.activity:activity-ktx:1.5.1")
+ implementation("androidx.activity:activity-ktx:1.7.0-beta02")
implementation("androidx.core:core:1.9.0")
implementation('androidx.collection:collection:1.0.0')
implementation("androidx.customview:customview-poolingcontainer:1.0.0")
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
- implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
implementation("androidx.profileinstaller:profileinstaller:1.2.1")
@@ -123,10 +121,10 @@
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(project(":test:screenshot:screenshot"))
- androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.5.1")
+ androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.0-rc01")
androidTestImplementation("androidx.recyclerview:recyclerview:1.3.0-alpha02")
androidTestImplementation("androidx.core:core-ktx:1.9.0")
- androidTestImplementation("androidx.activity:activity-compose:1.5.1")
+ androidTestImplementation("androidx.activity:activity-compose:1.7.0-beta02")
androidTestImplementation("androidx.appcompat:appcompat:1.3.0")
androidTestImplementation("androidx.fragment:fragment:1.3.0")
@@ -175,12 +173,11 @@
implementation("androidx.autofill:autofill:1.0.0")
implementation(libs.kotlinCoroutinesAndroid)
- implementation("androidx.activity:activity:1.7.0-beta02")
+ implementation("androidx.activity:activity-ktx:1.7.0-beta02")
implementation("androidx.core:core:1.9.0")
implementation('androidx.collection:collection:1.0.0')
implementation("androidx.customview:customview-poolingcontainer:1.0.0")
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
- implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
implementation("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
implementation("androidx.emoji2:emoji2:1.2.0")
@@ -251,10 +248,10 @@
implementation(project(":compose:ui:ui-test-junit4"))
implementation(project(":internal-testutils-runtime"))
implementation(project(":test:screenshot:screenshot"))
- implementation("androidx.lifecycle:lifecycle-runtime-testing:2.5.1")
+ implementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.0-rc01")
implementation("androidx.recyclerview:recyclerview:1.3.0-alpha02")
implementation("androidx.core:core-ktx:1.2.0")
- implementation("androidx.activity:activity-compose:1.5.1")
+ implementation("androidx.activity:activity-compose:1.7.0-beta02")
implementation("androidx.lifecycle:lifecycle-common:2.6.0-rc01")
}
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index e7f2dd4..25a4b70 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -57,6 +57,8 @@
resolutionStrategy.dependencySubstitution {
substitute(module("androidx.lifecycle:lifecycle-viewmodel:")).
using project(":lifecycle:lifecycle-viewmodel")
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel-ktx:")).
+ using project(":lifecycle:lifecycle-viewmodel-ktx")
substitute(module("androidx.lifecycle:lifecycle-runtime:")).
using project(":lifecycle:lifecycle-runtime")
substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).