Revert "Move dependencies to `commonMain` on `viewmodel-compose`"
Revert submission 3007635-vm-compose-kmp
Reason for revert: broke the build
https://android-build.corp.google.com/artifact/submitted/11602986/androidx/latest/view/logs%2Fbuild_error.log
Reverted changes: /q/submissionid:3007635-vm-compose-kmp
Change-Id: Id6369c4f8c20ded6bccc56676263761e0f8f1608
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index d876124..8a3a65f 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -41,14 +41,7 @@
sourceSets {
commonMain {
- dependencies {
- api(projectOrArtifact(":lifecycle:lifecycle-common"))
- api(projectOrArtifact(":lifecycle:lifecycle-viewmodel"))
- api(projectOrArtifact(":annotation:annotation"))
- api("androidx.compose.runtime:runtime:1.6.0")
- api("androidx.compose.ui:ui:1.6.0")
- implementation(libs.kotlinStdlib)
- }
+ // TODO(b/330323282): Move common dependencies here.
}
commonTest {
@@ -58,7 +51,14 @@
androidMain {
dependsOn(commonMain)
dependencies {
+ api projectOrArtifact(":lifecycle:lifecycle-common-java8")
+ api projectOrArtifact(":lifecycle:lifecycle-viewmodel-ktx")
api projectOrArtifact(":lifecycle:lifecycle-viewmodel-savedstate")
+ api("androidx.compose.runtime:runtime:1.6.0")
+ api "androidx.compose.ui:ui:1.6.0"
+ api("androidx.annotation:annotation-experimental:1.4.0")
+
+ implementation(libs.kotlinStdlib)
}
}
