Pin dependencies to annotation and collection libraries
We have released annotation and collection that support extra kmp
targets so we no longer need to keep these unpinned dependencies.
Test: None
Change-Id: I6c0cff3dd266a12733cc1854c5a1dba5587dd71a
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 595aef5..8eac369 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -46,7 +46,7 @@
implementation(project(":compose:ui:ui-unit"))
implementation(project(":compose:ui:ui-graphics"))
implementation(project(":compose:ui:ui-util"))
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
implementation(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
}
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index 16f1350..399503d 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -49,7 +49,7 @@
api(project(":compose:ui:ui-geometry"))
implementation(project(":compose:ui:ui-util"))
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
}
}
androidMain.dependencies {
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index f968628..a2950c4 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -52,7 +52,7 @@
implementation(project(":compose:ui:ui-util"))
implementation(project(":compose:ui:ui-graphics"))
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
}
}
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 0fefb0e..703c2f2 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -44,8 +44,8 @@
api(project(":compose:ui:ui"))
implementation(project(":compose:runtime:runtime"))
implementation(project(":compose:ui:ui-util"))
- implementation(project(":collection:collection"))
implementation(project(":compose:ui:ui-unit"))
+ implementation("androidx.collection:collection:1.4.2")
}
}
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 196e79c..ed11b00 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -41,7 +41,7 @@
commonMain {
dependencies {
implementation(libs.kotlinStdlib)
- api(project(":collection:collection"))
+ api("androidx.collection:collection:1.4.2")
api(project(":compose:animation:animation"))
api(project(":compose:runtime:runtime"))
api(project(":compose:ui:ui"))
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle
index 417619c..51fe754 100644
--- a/compose/material/material-ripple/build.gradle
+++ b/compose/material/material-ripple/build.gradle
@@ -44,7 +44,7 @@
api(project(":compose:foundation:foundation"))
api(project(":compose:runtime:runtime"))
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
implementation(project(":compose:animation:animation"))
implementation(project(":compose:ui:ui-util"))
}
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index a82f5ac..fc61115 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -43,7 +43,7 @@
dependencies {
implementation(libs.kotlinStdlibCommon)
implementation(libs.kotlinCoroutinesCore)
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
}
}
diff --git a/datastore/datastore-core/build.gradle b/datastore/datastore-core/build.gradle
index 0a0a304..d7eaded0 100644
--- a/datastore/datastore-core/build.gradle
+++ b/datastore/datastore-core/build.gradle
@@ -80,7 +80,7 @@
dependencies {
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
- api(project(":annotation:annotation"))
+ api("androidx.annotation:annotation:1.8.1")
}
}
diff --git a/datastore/datastore/build.gradle b/datastore/datastore/build.gradle
index c59b19f..05776a1 100644
--- a/datastore/datastore/build.gradle
+++ b/datastore/datastore/build.gradle
@@ -47,7 +47,7 @@
dependencies {
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
- api(project(":annotation:annotation"))
+ api("androidx.annotation:annotation:1.8.1")
api(project(":datastore:datastore-core"))
api(project(":datastore:datastore-core-okio"))
}
diff --git a/hilt/hilt-compiler/build.gradle b/hilt/hilt-compiler/build.gradle
index 7980e5f..3213852 100644
--- a/hilt/hilt-compiler/build.gradle
+++ b/hilt/hilt-compiler/build.gradle
@@ -39,7 +39,7 @@
implementation(libs.kspApi)
testImplementation(project(":hilt:hilt-common"))
- testImplementation(project(":annotation:annotation"))
+ testImplementation("androidx.annotation:annotation:1.8.1")
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(project(":room:room-compiler-processing-testing"))
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index cbd8d34..a1918e9 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -41,12 +41,10 @@
// Only needed to ensure version of annotation:annotation matches in impl
// and androidTestImpl, for both AOSP and playground builds.
- implementation(project(":annotation:annotation"))
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation:1.8.1")
+ implementation("androidx.annotation:annotation-experimental:1.4.1")
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation"))
- androidTestImplementation(project(":annotation:annotation-experimental"))
androidTestImplementation(libs.kotlinTest)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testExtJunit)
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle
index e5ff2a7..c1da69a 100644
--- a/remotecallback/remotecallback/build.gradle
+++ b/remotecallback/remotecallback/build.gradle
@@ -30,14 +30,14 @@
dependencies {
api("androidx.annotation:annotation:1.8.1")
- implementation(project(":collection:collection"))
+ implementation("androidx.collection:collection:1.4.2")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.mockitoCore, excludes.bytebuddy)
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy)
- androidTestAnnotationProcessor (project(":remotecallback:remotecallback-processor"))
+ androidTestAnnotationProcessor(project(":remotecallback:remotecallback-processor"))
}
android {
diff --git a/resourceinspection/resourceinspection-processor/build.gradle b/resourceinspection/resourceinspection-processor/build.gradle
index 720cf10e..5251358 100644
--- a/resourceinspection/resourceinspection-processor/build.gradle
+++ b/resourceinspection/resourceinspection-processor/build.gradle
@@ -46,7 +46,7 @@
testImplementation(libs.truth)
testRuntimeOnly(project(":resourceinspection:resourceinspection-annotation"))
- testRuntimeOnly(project(":annotation:annotation"))
+ testRuntimeOnly("androidx.annotation:annotation:1.8.1")
testRuntimeOnly(SdkHelperKt.getSdkDependency(project))
testRuntimeOnly(libs.intellijAnnotations)
testRuntimeOnly(libs.jsr250)
