Fix a build warning that is causing the presubmit to fail on the release branch (part 2)
Bug: 208647778
Relnote: N/A
Test: N/A
Change-Id: I706fd6593c979aa2969661f3d55ba3542cb5ac81
(cherry picked from commit 246a71559805868f4cbaea4953459f73a4cfcdda)
Merged-In:I706fd6593c979aa2969661f3d55ba3542cb5ac81
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index 1f6519a4..c41cce8 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -30,10 +30,10 @@
implementation("androidx.lifecycle:lifecycle-common-java8:2.2.0")
implementation("androidx.annotation:annotation:1.1.0")
implementation(libs.autoValueAnnotations)
- implementation("androidx.annotation:annotation-experimental:1.1.0")
+ api("androidx.annotation:annotation-experimental:1.1.0")
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
+ api(libs.kotlinStdlib)
annotationProcessor(libs.nullaway)
annotationProcessor(libs.autoValue)
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index 08e1fa5..854e820 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -27,10 +27,6 @@
annotationProcessor(libs.nullaway)
implementation("androidx.annotation:annotation:1.2.0")
- implementation("androidx.annotation:annotation-experimental:1.1.0")
- // There is an implicit compile-only dep due to :annotation-experimental
- // Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
testImplementation("junit:junit:4.13")
testImplementation(libs.testCore)
diff --git a/car/app/app-samples/helloworld/common/build.gradle b/car/app/app-samples/helloworld/common/build.gradle
index 23e5ff6..df2dced 100644
--- a/car/app/app-samples/helloworld/common/build.gradle
+++ b/car/app/app-samples/helloworld/common/build.gradle
@@ -30,7 +30,7 @@
implementation(project(":annotation:annotation-experimental"))
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
+ implementation(libs.kotlinStdlib)
testImplementation(libs.robolectric)
testImplementation(libs.testCore)
diff --git a/car/app/app-samples/navigation/common/build.gradle b/car/app/app-samples/navigation/common/build.gradle
index 75374b4..7fd106d 100644
--- a/car/app/app-samples/navigation/common/build.gradle
+++ b/car/app/app-samples/navigation/common/build.gradle
@@ -32,7 +32,7 @@
implementation project(path: ':annotation:annotation-experimental')
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
+ implementation(libs.kotlinStdlib)
implementation 'androidx.lifecycle:lifecycle-livedata:2.3.1'
implementation 'androidx.activity:activity:1.2.3'
}
diff --git a/car/app/app-samples/places/common/build.gradle b/car/app/app-samples/places/common/build.gradle
index a609e0d..75e059a 100644
--- a/car/app/app-samples/places/common/build.gradle
+++ b/car/app/app-samples/places/common/build.gradle
@@ -29,6 +29,10 @@
implementation(project(":car:app:app"))
implementation(libs.guavaAndroid)
+ implementation project(path: ':annotation:annotation-experimental')
+ // There is an implicit compile-only dep due to :annotation-experimental
+ // Build will complain without this manual declaration.
+ implementation(libs.kotlinStdlib)
implementation("androidx.core:core:1.5.0-alpha01")
}
diff --git a/car/app/app-samples/showcase/common/build.gradle b/car/app/app-samples/showcase/common/build.gradle
index 3bd3d2c..82f6fdf 100644
--- a/car/app/app-samples/showcase/common/build.gradle
+++ b/car/app/app-samples/showcase/common/build.gradle
@@ -32,6 +32,6 @@
implementation(project(":annotation:annotation-experimental"))
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
+ implementation(libs.kotlinStdlib)
}
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index 26f3ad7..e545823 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -56,10 +56,10 @@
implementation("androidx.lifecycle:lifecycle-viewmodel:2.2.0")
// Session and Screen both implement LifeCycleOwner so this needs to be exposed.
api("androidx.lifecycle:lifecycle-common-java8:2.2.0")
- implementation("androidx.annotation:annotation-experimental:1.1.0")
+ api("androidx.annotation:annotation-experimental:1.1.0")
// There is an implicit compile-only dep due to :annotation-experimental
// Build will complain without this manual declaration.
- compileOnly libs.kotlinStdlib
+ api(libs.kotlinStdlib) // Added for annotation-experimental
annotationProcessor(libs.nullaway)