[go: nahoru, domu]

Merge "Pin Compose Animation Dependencies to Compose 1.0.0" into androidx-main
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 63cdf9e..44a0afd 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -40,9 +40,9 @@
         api("androidx.annotation:annotation:1.1.0")
 
         implementation(project(":compose:runtime:runtime"))
-        implementation(project(":compose:ui:ui"))
-        implementation(project(":compose:ui:ui-unit"))
-        implementation(project(":compose:ui:ui-util"))
+        implementation("androidx.compose.ui:ui:1.0.0")
+        implementation("androidx.compose.ui:ui-unit:1.0.0")
+        implementation("androidx.compose.ui:ui-util:1.0.0")
         implementation(libs.kotlinStdlib)
         api(libs.kotlinCoroutinesCore)
 
@@ -57,7 +57,7 @@
         androidTestImplementation(libs.testCore)
         androidTestImplementation(libs.junit)
         androidTestImplementation(project(":compose:animation:animation"))
-        androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+        androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.0.0")
         androidTestImplementation(project(":compose:test-utils"))
 
         lintPublish project(":compose:animation:animation-core-lint")
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index 18ad38d..d69fec1 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -32,10 +32,10 @@
     compileOnly(project(":annotation:annotation-sampled"))
     implementation(project(":compose:animation:animation-core"))
     implementation(project(":compose:runtime:runtime"))
-    implementation(project(":compose:ui:ui"))
-    implementation(project(":compose:ui:ui-unit"))
-    implementation(project(":compose:foundation:foundation"))
-    implementation(project(":compose:material:material"))
+    implementation("androidx.compose.ui:ui:1.0.0")
+    implementation("androidx.compose.ui:ui-unit:1.0.0")
+    implementation("androidx.compose.foundation:foundation:1.0.0")
+    implementation("androidx.compose.material:material:1.0.0")
 }
 
 androidx {
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index c222c21..b102bdf 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -38,12 +38,12 @@
 
         api("androidx.annotation:annotation:1.1.0")
         api(project(":compose:animation:animation"))
-        api(project(":compose:foundation:foundation-layout"))
+        api("androidx.compose.foundation:foundation-layout:1.0.0")
         api(project(":compose:runtime:runtime"))
         api(project(":compose:ui:ui"))
-        api(project(":compose:ui:ui-geometry"))
+        api("androidx.compose.ui:ui-geometry:1.0.0")
 
-        implementation(project(":compose:ui:ui-util"))
+        implementation("androidx.compose.ui:ui-util:1.0.0")
         implementation(libs.kotlinStdlibCommon)
         implementation("androidx.core:core-ktx:1.5.0")
 
@@ -51,8 +51,8 @@
         testImplementation(libs.testRunner)
         testImplementation(libs.junit)
 
-        androidTestImplementation(project(":compose:foundation:foundation"))
-        androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+        androidTestImplementation("androidx.compose.foundation:foundation:1.0.0")
+        androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.0.0")
         androidTestImplementation(project(":compose:test-utils"))
         androidTestImplementation(libs.testRules)
         androidTestImplementation(libs.testRunner)
diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle
index 6f2593e..8fd9347 100644
--- a/compose/animation/animation-graphics/samples/build.gradle
+++ b/compose/animation/animation-graphics/samples/build.gradle
@@ -33,10 +33,10 @@
 
     implementation(project(":compose:animation:animation"))
     implementation(project(":compose:animation:animation-graphics"))
-    implementation(project(":compose:foundation:foundation"))
-    implementation(project(":compose:material:material"))
+    implementation("androidx.compose.foundation:foundation:1.0.0")
+    implementation("androidx.compose.material:material:1.0.0")
     implementation(project(":compose:runtime:runtime"))
-    implementation(project(":compose:ui:ui-text"))
+    implementation("androidx.compose.ui:ui-text:1.0.0")
 }
 
 androidx {
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index 728e201..b204e6e 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -38,20 +38,20 @@
 
         api("androidx.annotation:annotation:1.1.0")
         api(project(":compose:animation:animation-core"))
-        api(project(":compose:foundation:foundation-layout"))
+        api("androidx.compose.foundation:foundation-layout:1.0.0")
         api(project(":compose:runtime:runtime"))
-        api(project(":compose:ui:ui"))
-        api(project(":compose:ui:ui-geometry"))
+        api("androidx.compose.ui:ui:1.0.0")
+        api("androidx.compose.ui:ui-geometry:1.0.0")
 
-        implementation(project(":compose:ui:ui-util"))
+        implementation("androidx.compose.ui:ui-util:1.0.0")
         implementation(libs.kotlinStdlibCommon)
 
         testImplementation(libs.testRules)
         testImplementation(libs.testRunner)
         testImplementation(libs.junit)
 
-        androidTestImplementation(project(":compose:foundation:foundation"))
-        androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+        androidTestImplementation("androidx.compose.foundation:foundation:1.0.0")
+        androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.0.0")
         androidTestImplementation(project(":compose:test-utils"))
         androidTestImplementation(libs.testRules)
         androidTestImplementation(libs.testRunner)
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 2423c37..4ea7433 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -33,10 +33,10 @@
     compileOnly(project(":annotation:annotation-sampled"))
 
     implementation(project(":compose:animation:animation"))
-    implementation(project(":compose:foundation:foundation"))
-    implementation(project(":compose:material:material"))
+    implementation("androidx.compose.foundation:foundation:1.0.0")
+    implementation("androidx.compose.material:material:1.0.0")
     implementation(project(":compose:runtime:runtime"))
-    implementation(project(":compose:ui:ui-text"))
+    implementation("androidx.compose.ui:ui-text:1.0.0")
 }
 
 androidx {