Move lifecycle project deps to prebuilts in compose
Moving compose lifecycle project deps that are not for tests to the latests
2.6.0-rc01 prebuilts.
Test: ./gradlew bOS
Change-Id: Ic825f7b001dfa0b903b0291fa919e9290ffbafca
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index 797c91a..343fecb 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -54,8 +54,14 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
resolutionStrategy.dependencySubstitution {
+ substitute(module("androidx.lifecycle:lifecycle-common:")).
+ using project(":lifecycle:lifecycle-common")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
using project(":lifecycle:lifecycle-runtime-ktx")
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel:")).
+ using project(":lifecycle:lifecycle-viewmodel")
substitute(module("androidx.lifecycle:lifecycle-viewmodel-ktx:")).
using project(":lifecycle:lifecycle-viewmodel-ktx")
}
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index e2da821..1d95cf2 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -49,7 +49,7 @@
// 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(project(":lifecycle:lifecycle-viewmodel"))
+ implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
testImplementation(libs.testRules)
testImplementation(libs.testRunner)
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 8ba8b89..7090d9c 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -51,7 +51,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(project(":lifecycle:lifecycle-viewmodel"))
+ implementation("androidx.lifecycle:lifecycle-viewmodel:2.6.0-rc01")
testImplementation(libs.testRules)
testImplementation(libs.testRunner)
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index b2707cf..b2a7273 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -61,5 +61,7 @@
resolutionStrategy.dependencySubstitution {
substitute(module("androidx.lifecycle:lifecycle-common-java8:")).
using project(":lifecycle:lifecycle-common-java8")
+ substitute(module("androidx.lifecycle:lifecycle-common:")).
+ using project(":lifecycle:lifecycle-common")
}
}
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index d9d8529..da51dd8 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -30,8 +30,8 @@
implementation(libs.kotlinStdlib)
api(project(":compose:runtime:runtime"))
- api(project(":lifecycle:lifecycle-livedata"))
- api(projectOrArtifact(":lifecycle:lifecycle-runtime"))
+ api("androidx.lifecycle:lifecycle-livedata:2.6.0-rc01")
+ api("androidx.lifecycle:lifecycle-runtime:2.6.0-rc01")
implementation("androidx.compose.ui:ui:1.2.1")
androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4"))
diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle
index 816ab78..668bb91 100644
--- a/compose/ui/ui-test/samples/build.gradle
+++ b/compose/ui/ui-test/samples/build.gradle
@@ -51,7 +51,13 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
resolutionStrategy.dependencySubstitution {
+ substitute(module("androidx.lifecycle:lifecycle-common:")).
+ using project(":lifecycle:lifecycle-common")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
using project(":lifecycle:lifecycle-runtime-ktx")
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel:")).
+ using project(":lifecycle:lifecycle-viewmodel")
}
}
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index 76178c2..da290b3 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -38,11 +38,11 @@
api(project(":compose:ui:ui"))
api(project(":compose:ui:ui-tooling-preview"))
api(project(":compose:ui:ui-tooling-data"))
- implementation(project(":lifecycle:lifecycle-viewmodel"))
+ 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")
- implementation(project(":lifecycle:lifecycle-common"))
+ implementation("androidx.lifecycle:lifecycle-common:2.6.0-rc01")
// kotlin-reflect and animation-tooling-internal are provided by Studio at runtime
compileOnly(project(":compose:animation:animation-tooling-internal"))
@@ -90,7 +90,7 @@
implementation(project(":compose:material:material"))
implementation("androidx.activity:activity-compose:1.7.0-beta02")
- implementation(project(":lifecycle:lifecycle-common"))
+ implementation("androidx.lifecycle:lifecycle-common:2.6.0-rc01")
// kotlin-reflect and tooling-animation-internal are provided by Studio at runtime
compileOnly(project(":compose:animation:animation-tooling-internal"))
@@ -110,8 +110,8 @@
// Outside of androidx this is resolved via constraint added to lifecycle-common,
// but it doesn't work in androidx.
// See aosp/1804059
- implementation(project(":lifecycle:lifecycle-common-java8"))
- implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
+ 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 999984c..c1dd468 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -83,8 +83,8 @@
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(project(":lifecycle:lifecycle-runtime"))
- implementation(project(":lifecycle:lifecycle-viewmodel"))
+ 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")
implementation("androidx.emoji2:emoji2:1.2.0")
@@ -184,8 +184,8 @@
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(project(":lifecycle:lifecycle-runtime"))
- implementation(project(":lifecycle:lifecycle-viewmodel"))
+ 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")
}
@@ -257,7 +257,7 @@
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(project(":lifecycle:lifecycle-common"))
+ implementation("androidx.lifecycle:lifecycle-common:2.6.0-rc01")
}
desktopTest.dependencies {
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index 55609e8..8627741 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -52,9 +52,13 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
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-viewmodel-savedstate:")).
using project(":lifecycle:lifecycle-viewmodel-savedstate")
+ substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
+ using project(":lifecycle:lifecycle-runtime-ktx")
}
}
diff --git a/tv/samples/build.gradle b/tv/samples/build.gradle
index 5f24826..d7c3363 100644
--- a/tv/samples/build.gradle
+++ b/tv/samples/build.gradle
@@ -52,5 +52,11 @@
resolutionStrategy.dependencySubstitution {
substitute(module("androidx.lifecycle:lifecycle-livedata-core:")).
using project(":lifecycle:lifecycle-livedata-core")
+ substitute(module("androidx.lifecycle:lifecycle-common:")).
+ using project(":lifecycle:lifecycle-common")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
+ substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
+ using project(":lifecycle:lifecycle-runtime-ktx")
}
}
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index 69c53fc..be551b8 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -54,6 +54,10 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
resolutionStrategy.dependencySubstitution {
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel:")).
+ using project(":lifecycle:lifecycle-viewmodel")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
using project(":lifecycle:lifecycle-runtime-ktx")
}
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index 4eddd5f..64aa22f 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -64,8 +64,14 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
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-viewmodel-savedstate:")).
+ using project(":lifecycle:lifecycle-viewmodel-savedstate")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
using project(":lifecycle:lifecycle-runtime-ktx")
}
diff --git a/wear/compose/compose-material3/samples/build.gradle b/wear/compose/compose-material3/samples/build.gradle
index 10c22e1..d09ea46 100644
--- a/wear/compose/compose-material3/samples/build.gradle
+++ b/wear/compose/compose-material3/samples/build.gradle
@@ -63,8 +63,12 @@
// Workaround for https://github.com/gradle/gradle/issues/19882
configurations.all {
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:")).
using project(":lifecycle:lifecycle-runtime-ktx")
}
diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle
index 0f056c9..b7c7be1 100644
--- a/wear/compose/compose-navigation/build.gradle
+++ b/wear/compose/compose-navigation/build.gradle
@@ -30,7 +30,7 @@
api("androidx.navigation:navigation-runtime:2.5.3")
api(project(":wear:compose:compose-material"))
api(project(":activity:activity-compose"))
- api(project(":lifecycle:lifecycle-viewmodel-compose"))
+ api("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-rc01")
implementation(libs.kotlinStdlib)
implementation(project(":navigation:navigation-common"))
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index 959235d..e7f2dd4 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -52,3 +52,16 @@
inceptionYear = "2021"
description = "Contains the sample code for the Android Wear Compose Navigation Classes"
}
+
+configurations.all {
+ resolutionStrategy.dependencySubstitution {
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel:")).
+ using project(":lifecycle:lifecycle-viewmodel")
+ substitute(module("androidx.lifecycle:lifecycle-runtime:")).
+ using project(":lifecycle:lifecycle-runtime")
+ substitute(module("androidx.lifecycle:lifecycle-runtime-ktx:")).
+ using project(":lifecycle:lifecycle-runtime-ktx")
+ substitute(module("androidx.lifecycle:lifecycle-viewmodel-savedstate:")).
+ using project(":lifecycle:lifecycle-viewmodel-savedstate")
+ }
+}