Pin androidx.annotation:annotation-experimental dependency
The tip-of-tree dependency blocks the rc01 release
Change-Id: I0ef3700036542b9bd31a6b7fe221cc46238ce28d
diff --git a/wear/protolayout/protolayout-expression-pipeline/build.gradle b/wear/protolayout/protolayout-expression-pipeline/build.gradle
index af85399..7e20791 100644
--- a/wear/protolayout/protolayout-expression-pipeline/build.gradle
+++ b/wear/protolayout/protolayout-expression-pipeline/build.gradle
@@ -31,11 +31,11 @@
dependencies {
annotationProcessor(libs.nullaway)
api("androidx.annotation:annotation:1.2.0")
+
implementation("androidx.collection:collection:1.2.0")
implementation("androidx.core:core:1.7.0")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
-
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0-rc01")
implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
implementation(project(":wear:protolayout:protolayout-expression"))
diff --git a/wear/protolayout/protolayout-expression/build.gradle b/wear/protolayout/protolayout-expression/build.gradle
index c7124fa..312cabf 100644
--- a/wear/protolayout/protolayout-expression/build.gradle
+++ b/wear/protolayout/protolayout-expression/build.gradle
@@ -32,7 +32,7 @@
annotationProcessor(libs.nullaway)
api("androidx.annotation:annotation:1.2.0")
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0-rc01")
implementation("androidx.collection:collection:1.2.0")
implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
diff --git a/wear/protolayout/protolayout-material/build.gradle b/wear/protolayout/protolayout-material/build.gradle
index 11934f2..d2acf88 100644
--- a/wear/protolayout/protolayout-material/build.gradle
+++ b/wear/protolayout/protolayout-material/build.gradle
@@ -33,9 +33,12 @@
annotationProcessor(libs.nullaway)
api("androidx.annotation:annotation:1.2.0")
api(project(":wear:protolayout:protolayout"))
+
implementation(project(":wear:protolayout:protolayout-material-core"))
implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0-rc01")
+
+
androidTestImplementation(libs.junit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testExtJunit)
diff --git a/wear/protolayout/protolayout/build.gradle b/wear/protolayout/protolayout/build.gradle
index d6a862c..2515546 100644
--- a/wear/protolayout/protolayout/build.gradle
+++ b/wear/protolayout/protolayout/build.gradle
@@ -31,11 +31,11 @@
dependencies {
annotationProcessor(libs.nullaway)
api("androidx.annotation:annotation:1.2.0")
-
- implementation(project(":annotation:annotation-experimental"))
- implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
api(project(":wear:protolayout:protolayout-expression"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0-rc01")
+ implementation(project(path: ":wear:protolayout:protolayout-proto", configuration: "shadow"))
+
lintChecks(project(":wear:protolayout:protolayout-lint"))
lintPublish(project(":wear:protolayout:protolayout-lint"))
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index 4afba58..f10a1a8 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -35,7 +35,7 @@
api(project(":wear:protolayout:protolayout-expression"))
api(libs.guavaListenableFuture)
- implementation(project(":annotation:annotation-experimental"))
+ implementation("androidx.annotation:annotation-experimental:1.4.0-rc01")
implementation("androidx.concurrent:concurrent-futures:1.1.0")
implementation(project(path: ":wear:tiles:tiles-proto"))