Migrate shared camera pipe dependencies to Gradle version catalogs
Test: ./gradlew camera:camera-camera2-pipe:assembleDebug succeeds
Change-Id: Id053e17e7c5da29cf164a82de2c5165c7b932ac1
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 97e9f89..22e07ea 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -55,7 +55,7 @@
implementation(CAMERA_PIPE_DEPS.API)
implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION)
- kapt(libs.dagger)
+ kapt(libs.daggerCompiler)
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index bbc9516..1c78717 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -37,7 +37,7 @@
api(CAMERA_PIPE_DEPS.API)
implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION)
- kapt(libs.dagger)
+ kapt(libs.daggerCompiler)
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
@@ -48,7 +48,7 @@
testImplementation(project(":camera:camera-camera2-pipe-testing"))
testImplementation(project(":internal-testutils-truth"))
- kaptTest(libs.dagger)
+ kaptTest(libs.daggerCompiler)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testRunner)
diff --git a/camera/camera-camera2-pipe/dependencies.gradle b/camera/camera-camera2-pipe/dependencies.gradle
index dfbf6eb..2ef4ce0c 100644
--- a/camera/camera-camera2-pipe/dependencies.gradle
+++ b/camera/camera-camera2-pipe/dependencies.gradle
@@ -14,16 +14,14 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-
ext {
CAMERA_PIPE_DEPS = [
API : [
"androidx.annotation:annotation:1.2.0",
- KOTLIN_STDLIB,
- KOTLIN_COROUTINES_ANDROID,
+ libs.kotlinStdlib,
+ libs.kotlinCoroutinesAndroid,
"org.jetbrains.kotlinx:atomicfu:0.13.1"
],
- IMPLEMENTATION : [DAGGER]
+ IMPLEMENTATION : [libs.dagger]
]
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0975f0..5c87533 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@
androidxTestExt = "1.1.3-beta01"
autoService = "1.0-rc6"
autoValue = "1.6.3"
+dagger = "2.35"
dexmaker = "2.25.0"
espresso = "3.3.0"
hilt = "2.36"
@@ -54,7 +55,8 @@
assertj = { module = "org.assertj:assertj-core", version = "3.11.1" }
checkerframework = { module = "org.checkerframework:checker-qual", version = "2.5.3" }
constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.0.1"}
-dagger = { module = "com.google.dagger:dagger-compiler", version = "2.35" }
+dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
+daggerCompiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
dexmakerMockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker" }
dexmakerMockitoInline = { module = "com.linkedin.dexmaker:dexmaker-mockito-inline", version.ref = "dexmaker" }
dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version = "4.1.1" }