Ensure ListenableFuture is correctly included as API dependency
ListenableFuture shows up in the public API of camera-lifecycle and
camera-extensions.
Bug: 146223194
Test: N/A
Change-Id: Ic5fc00f0094af21a5edb829731293eef04d79cae
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 0662393..d8520ba 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -26,16 +26,15 @@
}
dependencies {
- api("androidx.lifecycle:lifecycle-livedata:2.1.0")
- api("androidx.annotation:annotation-experimental:1.0.0-rc01")
- implementation("androidx.exifinterface:exifinterface:1.0.0")
api("androidx.annotation:annotation:1.0.0")
+ api("androidx.annotation:annotation-experimental:1.0.0-rc01")
+ api("androidx.lifecycle:lifecycle-livedata:2.1.0")
+ api(GUAVA_LISTENABLE_FUTURE)
+ implementation("androidx.exifinterface:exifinterface:1.0.0")
implementation("androidx.core:core:1.1.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.lifecycle:lifecycle-common:2.1.0")
-
implementation(AUTO_VALUE_ANNOTATIONS)
- api(GUAVA_LISTENABLE_FUTURE)
annotationProcessor(AUTO_VALUE)
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 067e991..ebc2149 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -25,11 +25,11 @@
}
dependencies {
+ api(GUAVA_LISTENABLE_FUTURE)
api(project(":camera:camera-core"))
implementation(project(":camera:camera-camera2"))
implementation("androidx.core:core:1.0.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(GUAVA_LISTENABLE_FUTURE)
implementation(AUTO_VALUE_ANNOTATIONS)
annotationProcessor(AUTO_VALUE)
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index 2e66069..290b33b 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -26,8 +26,9 @@
}
dependencies {
- api(project(":camera:camera-core"))
api("androidx.lifecycle:lifecycle-common:2.1.0")
+ api(GUAVA_LISTENABLE_FUTURE)
+ api(project(":camera:camera-core"))
implementation("androidx.core:core:1.1.0")
annotationProcessor(AUTO_VALUE)
