Merge "Add project dependency constraint between lifecycle-viewmodel and lifecycle-viewmodel-ktx" into androidx-main
diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
index 23dbe99..aa4f8f2 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
@@ -32,6 +32,15 @@
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
+
+ constraints {
+ // this syntax mirrors the temporary workaround in lifecycle-viewmodel
+ // dependency constraints which allows lifecycle-viewmodel-ktx to have a
+ // project constraint on compose, even though compose is not within
+ // the 'MAIN' project-set.
+ // update syntax when b/239979823 is fixed.
+ implementation("androidx.lifecycle:lifecycle-viewmodel:{androidx.LibraryVersions.LIFECYCLE}")
+ }
}
androidx {
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index 59ad2de..58ca6cad 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -39,6 +39,10 @@
testImplementation(libs.truth)
constraints {
+ // this syntax is a temporary workout to allow project dependency on cross-project-set
+ // i.e. COMPOSE + MAIN project sets
+ // update syntax when b/239979823 is fixed
+ implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:{androidx.LibraryVersions.LIFECYCLE}")
implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
}
