Pin dependencies on androidx annotation
Test: ./gradlew docs
Change-Id: I95fa7af7ffc396f398dad896fbbdb8787d562e13
diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index c2e0a80..24d7a2e 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle
@@ -35,7 +35,7 @@
implementation("androidx.core:core-splashscreen:1.0.0")
// Manually align dependencies across debugRuntime and debugAndroidTestRuntime.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.testExtJunit)
diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle
index b626e67..abe144b 100644
--- a/annotation/annotation-experimental-lint/integration-tests/build.gradle
+++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle
@@ -40,7 +40,7 @@
dependencies {
implementation(libs.kotlinStdlib)
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
}
// Allow usage of Kotlin's @Experimental annotation, which is itself experimental.
diff --git a/appactions/interaction/interaction-service/build.gradle b/appactions/interaction/interaction-service/build.gradle
index 6659821..24af205 100644
--- a/appactions/interaction/interaction-service/build.gradle
+++ b/appactions/interaction/interaction-service/build.gradle
@@ -51,7 +51,7 @@
implementation(libs.jsr250)
// Force upgrade since 1.2.0 is not compatible with latest lint.
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
testImplementation(project(":appactions:interaction:interaction-capabilities-core"))
testImplementation(project(":appactions:interaction:interaction-capabilities-testing"))
diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle
index cdacff2..0a9360b 100644
--- a/appcompat/integration-tests/receive-content-testapp/build.gradle
+++ b/appcompat/integration-tests/receive-content-testapp/build.gradle
@@ -35,7 +35,7 @@
implementation(libs.material)
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation("androidx.lifecycle:lifecycle-common:2.6.1")
androidTestImplementation(libs.testCore)
diff --git a/benchmark/benchmark-common/build.gradle b/benchmark/benchmark-common/build.gradle
index 10990d6..c1f2b53 100644
--- a/benchmark/benchmark-common/build.gradle
+++ b/benchmark/benchmark-common/build.gradle
@@ -74,7 +74,7 @@
dependencies {
implementation(libs.kotlinStdlib)
api("androidx.annotation:annotation:1.7.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.tracing:tracing-ktx:1.0.0")
implementation(project(":tracing:tracing-perfetto-handshake"))
implementation("androidx.test:monitor:1.6.1")
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index b06a225..846fc99 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -29,7 +29,7 @@
dependencies {
api("androidx.core:core:1.1.0")
api("androidx.annotation:annotation:1.2.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api(libs.guavaListenableFuture)
implementation("androidx.collection:collection:1.1.0")
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 1818b1c..8d44786 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -74,7 +74,7 @@
androidTestImplementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.truth)
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(project(":camera:camera-lifecycle"))
androidTestImplementation(project(":camera:camera-testing")) {
// Ensure camera-testing does not pull in androidx.test dependencies
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 44b0f84..ae3db88 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -46,7 +46,7 @@
testImplementation(libs.robolectric)
testImplementation(libs.mockitoCore4)
testImplementation(libs.kotlinCoroutinesTest)
- testImplementation(project(":annotation:annotation-experimental"))
+ testImplementation("androidx.annotation:annotation-experimental:1.4.0")
testImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
testImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
testImplementation(project(":camera:camera-video"))
@@ -71,7 +71,7 @@
}
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.kotlinCoroutinesAndroid)
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(project(":internal-testutils-truth"))
androidTestImplementation("org.jetbrains.kotlinx:atomicfu:0.13.1")
androidTestImplementation("androidx.exifinterface:exifinterface:1.0.0")
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index bc1c4d8..520f97c 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -33,7 +33,7 @@
api("androidx.annotation:annotation:1.2.0")
api("androidx.lifecycle:lifecycle-livedata:2.1.0")
api(libs.guavaListenableFuture)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api(libs.kotlinStdlib) // Added for annotation-experimental
api("androidx.core:core:1.1.0")
implementation("androidx.exifinterface:exifinterface:1.3.2")
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index b224fbb..515d2da 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -51,7 +51,7 @@
}
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.kotlinCoroutinesAndroid)
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
androidTestImplementation(project(":internal-testutils-truth"))
androidTestImplementation("org.jetbrains.kotlinx:atomicfu:0.13.1")
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index c5dbaba..3ffab6d 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -35,7 +35,7 @@
api(project(":camera:camera-core"))
api(project(":camera:camera-video"))
implementation(project(":camera:camera-lifecycle"))
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.guavaListenableFuture)
implementation("androidx.core:core:1.3.2")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
diff --git a/camera/camera-viewfinder-core/build.gradle b/camera/camera-viewfinder-core/build.gradle
index b47ad6b..cfa03df 100644
--- a/camera/camera-viewfinder-core/build.gradle
+++ b/camera/camera-viewfinder-core/build.gradle
@@ -32,7 +32,7 @@
dependencies {
api("androidx.annotation:annotation:1.2.0")
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.guavaListenableFuture)
implementation("androidx.core:core:1.7.0")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
diff --git a/camera/camera-viewfinder/build.gradle b/camera/camera-viewfinder/build.gradle
index d7e9211..7ab055e 100644
--- a/camera/camera-viewfinder/build.gradle
+++ b/camera/camera-viewfinder/build.gradle
@@ -32,7 +32,7 @@
dependencies {
api("androidx.annotation:annotation:1.2.0")
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.guavaListenableFuture)
implementation("androidx.core:core:1.7.0")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index 14e4cc2..7bec0da 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -64,7 +64,7 @@
}
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
testImplementation(libs.kotlinCoroutinesTest)
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index 59cef71..4dda00a 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -98,7 +98,7 @@
debugImplementation(libs.testRunner)
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(libs.testCore)
diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle
index 28ebe70..bb95910 100644
--- a/camera/integration-tests/diagnosetestapp/build.gradle
+++ b/camera/integration-tests/diagnosetestapp/build.gradle
@@ -65,7 +65,7 @@
compileOnly(libs.kotlinCompiler)
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(libs.testExtJunit)
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index 3137f0a..bfa17a5 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -74,7 +74,7 @@
implementation("androidx.viewpager2:viewpager2:1.0.0")
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index 8eb3d62..840066e 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -67,7 +67,7 @@
implementation(libs.kotlinCoroutinesAndroid)
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(project(":concurrent:concurrent-futures"))
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 598b557..ca3d579 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -99,7 +99,7 @@
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.1.1'
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(libs.testExtJunit)
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index f882ac2..178d84d 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -59,7 +59,7 @@
compileOnly(libs.kotlinCompiler)
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(libs.testExtJunit)
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index 8cdc4c2..017a1cd 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -87,7 +87,7 @@
implementation("androidx.activity:activity-compose:1.3.1")
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
// Testing framework
androidTestImplementation(libs.testExtJunit)
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index aaf75d3..896c8db 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -31,7 +31,7 @@
dependencies {
api(project(":car:app:app"))
api(libs.guavaListenableFuture)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.guavaAndroid)
implementation("androidx.concurrent:concurrent-futures:1.1.0")
implementation("androidx.fragment:fragment:1.3.0")
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index 0abc8c7..b003f88 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -34,7 +34,7 @@
implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
implementation 'androidx.annotation:annotation:1.1.0'
implementation(libs.robolectric)
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
testImplementation(project(":car:app:app-projected"))
testImplementation(libs.junit)
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index 4582736..93d8396 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -61,7 +61,7 @@
implementation ("androidx.media:media:1.6.0")
// Session and Screen both implement LifeCycleOwner so this needs to be exposed.
api("androidx.lifecycle:lifecycle-common-java8:2.2.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
annotationProcessor(libs.nullaway)
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index 7d96f6d..648dad7 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -52,7 +52,7 @@
}
androidMain.dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core-ktx:1.5.0")
}
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index 578889e..643b18e 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -67,7 +67,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 126368e..062412b 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -63,7 +63,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core:1.7.0")
implementation("androidx.compose.animation:animation-core:1.2.1")
}
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 5822984..c80ec96 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -69,7 +69,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.emoji2:emoji2:1.3.0")
implementation("androidx.core:core:1.12.0")
}
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 692fbd3..df79395 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -83,7 +83,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
// TODO: remove next 3 dependencies when b/202810604 is fixed
implementation("androidx.savedstate:savedstate:1.2.1")
diff --git a/compose/material3/material3-adaptive-navigation-suite/build.gradle b/compose/material3/material3-adaptive-navigation-suite/build.gradle
index a59893c..72aee4b 100644
--- a/compose/material3/material3-adaptive-navigation-suite/build.gradle
+++ b/compose/material3/material3-adaptive-navigation-suite/build.gradle
@@ -66,7 +66,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/material3/material3-adaptive/build.gradle b/compose/material3/material3-adaptive/build.gradle
index 385ccc3..201ef13 100644
--- a/compose/material3/material3-adaptive/build.gradle
+++ b/compose/material3/material3-adaptive/build.gradle
@@ -65,7 +65,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.window:window:1.2.0")
}
}
diff --git a/compose/material3/material3-window-size-class/build.gradle b/compose/material3/material3-window-size-class/build.gradle
index 1308a54..7df5be0 100644
--- a/compose/material3/material3-window-size-class/build.gradle
+++ b/compose/material3/material3-window-size-class/build.gradle
@@ -74,7 +74,7 @@
androidMain {
dependsOn(jvmMain)
dependencies {
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.window:window:1.0.0")
}
}
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 8db81f3..508b34f 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -85,7 +85,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.activity:activity-compose:1.5.0")
// TODO: remove next 3 dependencies when b/202810604 is fixed
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index 3941bc2..15bf866 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -81,7 +81,7 @@
dependsOn(jvmMain)
dependencies {
api(libs.kotlinCoroutinesAndroid)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index d44a291..c7619ae 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -76,7 +76,7 @@
//implementation("androidx.graphics:graphics-path:1.0.0-beta01")
implementation(project(":graphics:graphics-path"))
api(libs.androidx.annotation)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index 183c508..dc89b2a 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -81,7 +81,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core:1.7.0")
implementation("androidx.emoji2:emoji2:1.2.0")
implementation('androidx.collection:collection:1.0.0')
diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle
index bfae122..1f20915 100644
--- a/compose/ui/ui-tooling-data/build.gradle
+++ b/compose/ui/ui-tooling-data/build.gradle
@@ -70,7 +70,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index 40dc10b..eb3520b 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -67,7 +67,7 @@
dependsOn(jvmMain)
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation('androidx.collection:collection-ktx:1.2.0')
}
}
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index 97f170c7..b71de8d 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -61,7 +61,7 @@
dependsOn(jvmMain)
dependencies {
implementation(libs.kotlinStdlib)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
}
}
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 2ea3cd1..8818f7b 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -82,7 +82,7 @@
dependsOn(jvmMain)
dependencies {
implementation(libs.kotlinStdlib)
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
// This has stub APIs for access to legacy Android APIs, so we don't want
// any dependency on this module.
compileOnly(project(":compose:ui:ui-android-stubs"))
diff --git a/core/core-telecom/build.gradle b/core/core-telecom/build.gradle
index 4c8fbd1..e0148ab 100644
--- a/core/core-telecom/build.gradle
+++ b/core/core-telecom/build.gradle
@@ -35,7 +35,7 @@
api(libs.guavaListenableFuture)
implementation("androidx.annotation:annotation:1.4.0")
// @OptIn annotations
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core:1.9.0")
implementation(libs.kotlinCoroutinesCore)
implementation(libs.kotlinCoroutinesGuava)
diff --git a/core/core-telecom/integration-tests/testapp/build.gradle b/core/core-telecom/integration-tests/testapp/build.gradle
index d831923..a998e35 100644
--- a/core/core-telecom/integration-tests/testapp/build.gradle
+++ b/core/core-telecom/integration-tests/testapp/build.gradle
@@ -50,7 +50,7 @@
implementation('androidx.recyclerview:recyclerview:1.2.1')
// Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath.
- androidTestImplementation(project(":annotation:annotation-experimental"))
+ androidTestImplementation("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testRunner)
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 17d3ad1..2799274 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -22,7 +22,7 @@
}
api("androidx.annotation:annotation:1.6.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api("androidx.lifecycle:lifecycle-runtime:2.6.2")
api("androidx.versionedparcelable:versionedparcelable:1.1.1")
implementation("androidx.collection:collection:1.0.0")
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 352bb4c..25050759 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -43,7 +43,7 @@
api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1")
implementation("androidx.profileinstaller:profileinstaller:1.3.0")
api("androidx.savedstate:savedstate:1.2.1")
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api(libs.kotlinStdlib)
androidTestImplementation("androidx.appcompat:appcompat:1.1.0", {
diff --git a/glance/glance-template/build.gradle b/glance/glance-template/build.gradle
index dec7cd8..cc9ddd7 100644
--- a/glance/glance-template/build.gradle
+++ b/glance/glance-template/build.gradle
@@ -49,7 +49,7 @@
implementation(libs.kotlinStdlib)
// Force upgrade since 1.2.0 is not compatible with latest lint.
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
testImplementation(libs.robolectric)
testImplementation(libs.testCore)
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 43f0cde..3b10987 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -46,7 +46,7 @@
implementation(libs.kotlinStdlib)
// Force upgrade since 1.2.0 is not compatible with latest lint.
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
testImplementation(libs.robolectric)
testImplementation(libs.testCore)
diff --git a/graphics/filters/filters/build.gradle b/graphics/filters/filters/build.gradle
index d6406c1..338ef20 100644
--- a/graphics/filters/filters/build.gradle
+++ b/graphics/filters/filters/build.gradle
@@ -43,7 +43,7 @@
implementation('androidx.media3:media3-transformer:' + media3Version)
// Force upgrade since 1.2.0 is not compatible with latest lint.
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
// Test dependencies
androidTestImplementation(libs.testExtJunit)
diff --git a/graphics/graphics-core/build.gradle b/graphics/graphics-core/build.gradle
index bc917ea..45ad794 100644
--- a/graphics/graphics-core/build.gradle
+++ b/graphics/graphics-core/build.gradle
@@ -33,7 +33,7 @@
dependencies {
api(libs.kotlinStdlib)
implementation(libs.kotlinCoroutinesAndroid)
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core:1.8.0")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle
index 173eee3..e6d937c 100644
--- a/lifecycle/lifecycle-runtime-compose/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/build.gradle
@@ -34,7 +34,7 @@
dependencies {
api projectOrArtifact(":lifecycle:lifecycle-runtime-ktx")
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api("androidx.compose.runtime:runtime:1.0.1")
api("androidx.compose.ui:ui:1.0.1")
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index 404e68f..de2379f 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -39,7 +39,7 @@
api projectOrArtifact(":lifecycle:lifecycle-viewmodel-savedstate")
api("androidx.compose.runtime:runtime:1.0.1")
api "androidx.compose.ui:ui:1.0.1"
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.kotlinStdlib)
diff --git a/lint-checks/integration-tests/build.gradle b/lint-checks/integration-tests/build.gradle
index 130e500..4028590 100644
--- a/lint-checks/integration-tests/build.gradle
+++ b/lint-checks/integration-tests/build.gradle
@@ -31,7 +31,7 @@
dependencies {
implementation(project(":annotation:annotation"))
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.kotlinStdlib)
}
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index 443a46b..d83b630 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -35,7 +35,7 @@
api("androidx.activity:activity-ktx:1.7.1")
api("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation('androidx.collection:collection:1.1.0')
api(libs.kotlinStdlib)
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index eab9cd6..5843a18 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -47,7 +47,7 @@
api("androidx.drawerlayout:drawerlayout:1.1.1")
api("com.google.android.material:material:1.4.0")
implementation("androidx.transition:transition:1.3.0")
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
androidTestImplementation(project(":internal-testutils-navigation"), {
exclude group: "androidx.navigation", module: "navigation-common"
diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle
index 861a0cd..b2ad700 100644
--- a/paging/samples/build.gradle
+++ b/paging/samples/build.gradle
@@ -41,7 +41,7 @@
compileOnly(project(":annotation:annotation-sampled"))
implementation("androidx.appcompat:appcompat:1.2.0")
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.fragment:fragment-ktx:1.3.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0")
implementation("androidx.recyclerview:recyclerview:1.2.0")
diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle
index a66bd45..eb47b7a 100644
--- a/testutils/testutils-appcompat/build.gradle
+++ b/testutils/testutils-appcompat/build.gradle
@@ -32,7 +32,7 @@
dependencies {
api(project(":internal-testutils-runtime"))
api(project(":appcompat:appcompat"))
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation(libs.testExtJunit)
implementation(libs.testCore)
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle
index aeb25ad..bd1608a 100644
--- a/viewpager2/viewpager2/build.gradle
+++ b/viewpager2/viewpager2/build.gradle
@@ -31,7 +31,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.core:core:1.3.2")
api("androidx.fragment:fragment:1.1.0")
api("androidx.recyclerview:recyclerview:1.3.1")
diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle
index 991473b..3d54101 100644
--- a/window/extensions/extensions/build.gradle
+++ b/window/extensions/extensions/build.gradle
@@ -31,7 +31,7 @@
dependencies {
implementation("androidx.annotation:annotation:1.6.0")
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.window.extensions.core:core:1.0.0")
testImplementation(libs.robolectric)
diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle
index 6f9cc9e..bc8d3bc 100644
--- a/work/work-runtime/build.gradle
+++ b/work/work-runtime/build.gradle
@@ -67,7 +67,7 @@
implementation("androidx.core:core:1.12.0")
implementation("androidx.room:room-ktx:2.6.1")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
- api(projectOrArtifact(":annotation:annotation-experimental"))
+ api("androidx.annotation:annotation-experimental:1.4.0")
api(libs.guavaListenableFuture)
api("androidx.lifecycle:lifecycle-livedata:2.6.2")
api("androidx.startup:startup-runtime:1.1.1")
