Migrate camera to use Gradle Version Catalogs
- Ran development/versionCatalogMigrate.sh
- Manually updated imports in build.gradle files
Test: ./gradlew tasks
Change-Id: I0ab09457cda73a3ba668f4a7b2ad4658f1b6c0d5
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index d7ee6fb..09c1751 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -14,14 +14,13 @@
* limitations under the License.
*/
+
import androidx.build.BundleInsideHelper
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -49,29 +48,29 @@
// Classes and types that are only needed at runtime
implementation(project(":lifecycle:lifecycle-livedata-ktx"))
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(KOTLIN_COROUTINES_GUAVA)
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinCoroutinesGuava)
+ implementation(libs.kotlinStdlib)
// Since we jarjar CameraPipe, include the transitive dependencies as implementation
implementation(CAMERA_PIPE_DEPS.API)
implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION)
- kapt(DAGGER_COMPILER)
+ kapt(libs.dagger)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(KOTLIN_COROUTINES_TEST)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.kotlinCoroutinesTest)
testImplementation(project(":camera:camera-camera2-pipe-testing"))
testImplementation(project(":internal-testutils-truth"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":annotation:annotation-experimental"))
androidTestImplementation(project(":camera:camera-lifecycle"))
androidTestImplementation(project(":concurrent:concurrent-futures-ktx"))
diff --git a/camera/camera-camera2-pipe-testing/build.gradle b/camera/camera-camera2-pipe-testing/build.gradle
index c340844..189f0a1 100644
--- a/camera/camera-camera2-pipe-testing/build.gradle
+++ b/camera/camera-camera2-pipe-testing/build.gradle
@@ -14,14 +14,13 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -33,16 +32,16 @@
api("androidx.annotation:annotation:1.1.0")
// Classes and types that are only needed at runtime
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_COROUTINES_GUAVA)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinCoroutinesGuava)
implementation(project(":camera:camera-camera2-pipe"))
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(ROBOLECTRIC)
- testImplementation(TRUTH)
- testImplementation(KOTLIN_COROUTINES_TEST)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.truth)
+ testImplementation(libs.kotlinCoroutinesTest)
}
android {
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index 50d5b87..bbc9516 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -14,14 +14,13 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -38,22 +37,22 @@
api(CAMERA_PIPE_DEPS.API)
implementation(CAMERA_PIPE_DEPS.IMPLEMENTATION)
- kapt(DAGGER_COMPILER)
+ kapt(libs.dagger)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(KOTLIN_COROUTINES_TEST)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.kotlinCoroutinesTest)
testImplementation(project(":camera:camera-camera2-pipe-testing"))
testImplementation(project(":internal-testutils-truth"))
- kaptTest(DAGGER_COMPILER)
+ kaptTest(libs.dagger)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.truth)
}
android {
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 55981b2..3052687 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -18,8 +18,6 @@
import androidx.build.LibraryGroups
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -31,36 +29,36 @@
api("androidx.annotation:annotation:1.2.0")
implementation("androidx.core:core:1.1.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(GUAVA_LISTENABLE_FUTURE)
- implementation(AUTO_VALUE_ANNOTATIONS)
+ implementation(libs.guavaListenableFuture)
+ implementation(libs.autoValueAnnotations)
- annotationProcessor(AUTO_VALUE)
+ annotationProcessor(libs.autoValue)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(MOCKITO_CORE)
- testImplementation(KOTLIN_COROUTINES_TEST)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.mockitoCore)
+ testImplementation(libs.kotlinCoroutinesTest)
testImplementation("androidx.annotation:annotation-experimental:1.1.0")
testImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.3.1")
testImplementation(project(":camera:camera-testing"))
testImplementation("androidx.arch.core:core-testing:2.1.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it's own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation("androidx.appcompat:appcompat:1.1.0")
androidTestImplementation(project(":camera:camera-testing"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation("androidx.annotation:annotation-experimental:1.1.0")
androidTestImplementation(project(":internal-testutils-truth"))
androidTestImplementation("org.jetbrains.kotlinx:atomicfu:0.13.1")
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index aa1cb74..10d5397 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -18,8 +18,6 @@
import androidx.build.LibraryGroups
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -29,39 +27,39 @@
dependencies {
api("androidx.annotation:annotation:1.2.0")
api("androidx.lifecycle:lifecycle-livedata:2.1.0")
- api(GUAVA_LISTENABLE_FUTURE)
+ api(libs.guavaListenableFuture)
api("androidx.annotation:annotation-experimental:1.1.0")
- api(KOTLIN_STDLIB) // Added for annotation-experimental
+ api(libs.kotlinStdlib) // Added for annotation-experimental
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)
+ implementation(libs.autoValueAnnotations)
- annotationProcessor(AUTO_VALUE)
+ annotationProcessor(libs.autoValue)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.mockitoCore)
testImplementation(project(":camera:camera-testing"), {
exclude group: "androidx.camera", module: "camera-core"
})
testImplementation("androidx.exifinterface:exifinterface:1.0.0")
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it's own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(project(":camera:camera-testing"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
androidTestImplementation(project(":internal-testutils-truth"))
}
diff --git a/camera/camera-extensions-stub/build.gradle b/camera/camera-extensions-stub/build.gradle
index a5511a1..6d234f3 100644
--- a/camera/camera-extensions-stub/build.gradle
+++ b/camera/camera-extensions-stub/build.gradle
@@ -12,12 +12,12 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryVersions
-import androidx.build.LibraryGroups
-import androidx.build.Publish
-plugins {
+ import androidx.build.LibraryGroups
+ import androidx.build.LibraryVersions
+ import androidx.build.Publish
+
+ plugins {
id("AndroidXPlugin")
id("com.android.library")
}
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 9740be7..c9cfa28 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryVersions
+
import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
@@ -27,32 +27,32 @@
}
dependencies {
- api(GUAVA_LISTENABLE_FUTURE)
+ api(libs.guavaListenableFuture)
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(AUTO_VALUE_ANNOTATIONS)
- annotationProcessor(AUTO_VALUE)
+ implementation(libs.autoValueAnnotations)
+ annotationProcessor(libs.autoValue)
compileOnly(project(":camera:camera-extensions-stub"))
- testImplementation(JUNIT)
- testImplementation(MOCKITO_CORE)
- testImplementation(ROBOLECTRIC)
- testImplementation(TRUTH)
+ testImplementation(libs.junit)
+ testImplementation(libs.mockitoCore)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.truth)
testImplementation(project(":camera:camera-testing"))
testImplementation(project(":camera:camera-extensions-stub"))
// To use the extensions-stub for testing directly.
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has its own MockMaker
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has its own MockMaker
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has its own MockMaker
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":camera:camera-lifecycle"))
androidTestImplementation(project(":camera:camera-testing"))
androidTestImplementation(project(":internal-testutils-truth"))
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index c6c7cea..42d4b73 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -18,8 +18,6 @@
import androidx.build.LibraryGroups
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -28,21 +26,21 @@
dependencies {
api("androidx.lifecycle:lifecycle-common:2.1.0")
- api(GUAVA_LISTENABLE_FUTURE)
+ api(libs.guavaListenableFuture)
api(project(":camera:camera-core"))
implementation("androidx.core:core:1.1.0")
- implementation(AUTO_VALUE_ANNOTATIONS)
+ implementation(libs.autoValueAnnotations)
- annotationProcessor(AUTO_VALUE)
+ annotationProcessor(libs.autoValue)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":camera:camera-testing"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation("androidx.annotation:annotation-experimental:1.1.0")
androidTestImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
androidTestImplementation(project(":internal-testutils-truth"))
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index 0f3fd42..8613c38 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -15,11 +15,9 @@
*/
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.Publish
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("AndroidXPlugin")
@@ -28,27 +26,27 @@
}
dependencies {
- implementation(ANDROIDX_TEST_CORE)
- implementation(ANDROIDX_TEST_RULES)
- implementation(ANDROIDX_TEST_UIAUTOMATOR)
+ implementation(libs.testCore)
+ implementation(libs.testRules)
+ implementation(libs.testUiautomator)
api("androidx.annotation:annotation:1.2.0")
- implementation(ESPRESSO_CORE)
- implementation(GUAVA_LISTENABLE_FUTURE)
+ implementation(libs.espressoCore)
+ implementation(libs.guavaListenableFuture)
implementation("androidx.appcompat:appcompat:1.1.0")
api(project(":camera:camera-core"))
implementation("androidx.core:core:1.1.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
implementation("androidx.test.espresso:espresso-idling-resource:3.1.0")
- implementation(JUNIT)
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(libs.junit)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinCoroutinesAndroid)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.mockitoCore)
}
android {
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index 70b825f..a3e03e9 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryVersions
+
import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -30,38 +30,38 @@
api(project(":camera:camera-core"))
implementation("androidx.core:core:1.1.0")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(AUTO_VALUE_ANNOTATIONS)
+ implementation(libs.autoValueAnnotations)
- annotationProcessor(AUTO_VALUE)
+ annotationProcessor(libs.autoValue)
// TODO(leohuang): We need this for assertThrows. Point back to the AndroidX shared version if
// it is ever upgraded.
testImplementation("junit:junit:4.13")
- testImplementation(KOTLIN_STDLIB)
- testImplementation(ANDROIDX_TEST_CORE)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- testImplementation(ROBOLECTRIC)
- testImplementation(MOCKITO_CORE)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.testCore)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.mockitoCore)
testImplementation(project(":camera:camera-testing"), {
exclude group: "androidx.camera", module: "camera-core"
})
androidTestImplementation(project(path: ":camera:camera-camera2"))
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(TRUTH)
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it's own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.truth)
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(project(":camera:camera-testing"))
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
androidTestImplementation(project(":concurrent:concurrent-futures-ktx"))
androidTestImplementation(project(":internal-testutils-truth"))
- androidTestImplementation MOCKITO_KOTLIN, {
+ androidTestImplementation libs.mockitoKotlin, {
exclude group: 'org.mockito' // to keep control on the mockito version
}
}
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index e32f7a9..43e55a9 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -19,8 +19,6 @@
import androidx.build.LibraryVersions
import androidx.build.Publish
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.library")
@@ -35,23 +33,23 @@
api("androidx.camera:camera-core:${VIEW_ATOMIC_GROUP_PINNED_VER}")
implementation("androidx.camera:camera-lifecycle:${VIEW_ATOMIC_GROUP_PINNED_VER}")
implementation("androidx.annotation:annotation-experimental:1.1.0-rc01")
- implementation(GUAVA_LISTENABLE_FUTURE)
+ implementation(libs.guavaListenableFuture)
implementation("androidx.core:core:1.3.2")
implementation("androidx.concurrent:concurrent-futures:1.0.0")
- implementation(AUTO_VALUE_ANNOTATIONS)
+ implementation(libs.autoValueAnnotations)
implementation("androidx.appcompat:appcompat:1.1.0")
// Added for annotation-experimental
- compileOnly(KOTLIN_STDLIB)
+ compileOnly(libs.kotlinStdlib)
- annotationProcessor(AUTO_VALUE)
+ annotationProcessor(libs.autoValue)
- testImplementation(ANDROIDX_TEST_RUNNER)
- testImplementation(MOCKITO_CORE)
- testImplementation(ROBOLECTRIC)
- testImplementation(KOTLIN_STDLIB)
- testImplementation(TRUTH)
- testImplementation(ANDROIDX_TEST_RULES)
- testImplementation(ANDROIDX_TEST_CORE)
+ testImplementation(libs.testRunner)
+ testImplementation(libs.mockitoCore)
+ testImplementation(libs.robolectric)
+ testImplementation(libs.kotlinStdlib)
+ testImplementation(libs.truth)
+ testImplementation(libs.testRules)
+ testImplementation(libs.testCore)
testImplementation(project(":camera:camera-testing")) {
// Ensure camera-testing does not pull in camera-core project dependency which will
// override pinned dependency.
@@ -63,18 +61,18 @@
// override pinned dependency.
exclude(group:"androidx.camera", module:"camera-core")
}
- androidTestImplementation(MOCKITO_CORE)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.mockitoCore)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.truth)
androidTestImplementation("androidx.camera:camera-camera2:${VIEW_ATOMIC_GROUP_PINNED_VER}")
- androidTestImplementation(MOCKITO_CORE, excludes.bytebuddy) // DexMaker has it's own MockMaker
- androidTestImplementation(DEXMAKER_MOCKITO, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it's own MockMaker
}
android {
defaultConfig {
diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle
index 4aa9ef6..1caa678 100644
--- a/camera/integration-tests/camerapipetestapp/build.gradle
+++ b/camera/integration-tests/camerapipetestapp/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.CONSTRAINT_LAYOUT
plugins {
id("AndroidXPlugin")
@@ -51,7 +51,7 @@
dependencies {
// Internal library
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
// Android Support Library
implementation("androidx.appcompat:appcompat:1.1.0")
@@ -61,15 +61,15 @@
implementation(project(":camera:camera-camera2-pipe"))
// Testing framework
- testImplementation(TRUTH)
- testImplementation(JUNIT)
- testImplementation(TRUTH)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(TRUTH)
- debugImplementation(ANDROIDX_TEST_CORE)
+ testImplementation(libs.truth)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.truth)
+ debugImplementation(libs.testCore)
}
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index 86d7391..61455aa 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -15,9 +15,10 @@
* limitations under the License.
*/
+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.CONSTRAINT_LAYOUT
plugins {
id("AndroidXPlugin")
@@ -75,37 +76,37 @@
// Android Support Library
api(CONSTRAINT_LAYOUT, { transitive = true })
- implementation(GUAVA_ANDROID)
- implementation(ESPRESSO_IDLING_RESOURCE)
+ implementation(libs.guavaAndroid)
+ implementation(libs.espressoIdlingResource)
// MLKit library: Barcode scanner
- implementation(MLKIT_GMS_BARCODE, excludes.mlkit)
+ implementation(libs.mlkitBarcode, excludes.mlkit)
// 3P library
- debugImplementation(LEAKCANARY)
+ debugImplementation(libs.leakcanary)
// Testing resource dependency for manifest
debugImplementation(project(":camera:camera-testing"))
// Testing framework
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(ESPRESSO_IDLING_RESOURCE)
- androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(KOTLIN_COROUTINES_ANDROID)
- androidTestImplementation(LEAKCANARY)
- androidTestImplementation(LEAKCANARY_INSTRUMENTATION)
- androidTestImplementation(TRUTH)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
+ androidTestImplementation(libs.espressoIdlingResource)
+ androidTestImplementation(libs.kotlinStdlib)
+ androidTestImplementation(libs.kotlinCoroutinesAndroid)
+ androidTestImplementation(libs.leakcanary)
+ androidTestImplementation(libs.leakcanaryInstrumentation)
+ androidTestImplementation(libs.truth)
androidTestImplementation(project(":camera:camera-testing"))
androidTestImplementation(project(":concurrent:concurrent-futures"))
androidTestImplementation(project(":concurrent:concurrent-futures-ktx"))
androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing"))
- testImplementation(JUNIT)
- testImplementation(TRUTH)
+ testImplementation(libs.junit)
+ testImplementation(libs.truth)
}
// Allow usage of Kotlin's @OptIn.
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index bdcea02..77a4380 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.CONSTRAINT_LAYOUT
plugins {
id("AndroidXPlugin")
@@ -38,7 +38,7 @@
implementation(project(":camera:camera-lifecycle"))
implementation(project(":camera:camera-view"))
implementation("androidx.test.espresso:espresso-idling-resource:3.1.0")
- implementation(GUAVA_LISTENABLE_FUTURE)
+ implementation(libs.guavaListenableFuture)
implementation("androidx.concurrent:concurrent-futures:1.0.0")
// Android Support Library
@@ -46,14 +46,14 @@
implementation("androidx.appcompat:appcompat:1.1.0")
// Guava
- implementation(GUAVA_ANDROID)
+ implementation(libs.guavaAndroid)
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
androidTestImplementation(project(":camera:camera-testing"))
androidTestCompileOnly(project(":camera:camera-extensions-stub"))
diff --git a/camera/integration-tests/extensionstestlib/build.gradle b/camera/integration-tests/extensionstestlib/build.gradle
index ea4767e..deb9bbd 100644
--- a/camera/integration-tests/extensionstestlib/build.gradle
+++ b/camera/integration-tests/extensionstestlib/build.gradle
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
-import androidx.build.LibraryVersions
+
import androidx.build.LibraryGroups
import androidx.build.Publish
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index db40530..73186e7 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+import static androidx.build.dependencies.DependenciesKt.CONSTRAINT_LAYOUT
plugins {
id("AndroidXPlugin")
@@ -64,18 +64,18 @@
implementation("androidx.exifinterface:exifinterface:1.0.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.2.0")
implementation(CONSTRAINT_LAYOUT, { transitive = true })
- implementation(KOTLIN_STDLIB)
- implementation(KOTLIN_COROUTINES_ANDROID)
+ implementation(libs.kotlinStdlib)
+ implementation(libs.kotlinCoroutinesAndroid)
// Testing framework
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE)
- implementation(ESPRESSO_IDLING_RESOURCE)
- implementation(TRUTH)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.espressoCore)
+ implementation(libs.espressoIdlingResource)
+ implementation(libs.truth)
// Statistics library
- implementation(GUAVA_ANDROID)
+ implementation(libs.guavaAndroid)
}
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index e52e977..ad5c90b 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -13,9 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -52,7 +49,7 @@
dependencies {
// Internal library
- implementation(KOTLIN_STDLIB)
+ implementation(libs.kotlinStdlib)
implementation(project(":camera:camera-camera2"))
implementation(project(":camera:camera-lifecycle"))
implementation(project(":camera:camera-view"))
@@ -62,16 +59,16 @@
implementation("androidx.viewpager2:viewpager2:1.0.0")
// Testing framework
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
androidTestImplementation(project(":camera:camera-testing"))
androidTestImplementation(project(":internal-testutils-runtime"))
- androidTestImplementation(TRUTH)
- debugImplementation(ANDROIDX_TEST_CORE)
+ androidTestImplementation(libs.truth)
+ debugImplementation(libs.testCore)
debugImplementation("androidx.fragment:fragment-testing:1.2.5")
// Testing resource dependency for manifest
debugImplementation(project(":camera:camera-testing"))
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index 689feab..295b9a4 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -14,9 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import static androidx.build.dependencies.DependenciesKt.*
-
plugins {
id("AndroidXPlugin")
id("com.android.application")
@@ -57,7 +54,7 @@
implementation("androidx.camera:camera-lifecycle:${VIEW_ATOMIC_GROUP_PINNED_VER}")
implementation(project(":lifecycle:lifecycle-runtime"))
implementation(project(":camera:camera-view"))
- implementation(GUAVA_ANDROID)
+ implementation(libs.guavaAndroid)
implementation("androidx.exifinterface:exifinterface:1.3.2")
// Lifecycle and LiveData
@@ -67,17 +64,17 @@
implementation("androidx.appcompat:appcompat:1.1.0")
// Testing framework
- androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
- androidTestImplementation(ANDROIDX_TEST_CORE)
- androidTestImplementation(ANDROIDX_TEST_RUNNER)
- androidTestImplementation(ANDROIDX_TEST_RULES)
- androidTestImplementation(ANDROIDX_TEST_UIAUTOMATOR)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(libs.testExtJunit)
+ androidTestImplementation(libs.testCore)
+ androidTestImplementation(libs.testRunner)
+ androidTestImplementation(libs.testRules)
+ androidTestImplementation(libs.testUiautomator)
+ androidTestImplementation(libs.espressoCore)
androidTestImplementation(project(":lifecycle:lifecycle-runtime-testing"))
androidTestImplementation(project(":lifecycle:lifecycle-runtime"))
androidTestImplementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0")
- androidTestImplementation(TRUTH)
- debugImplementation(ANDROIDX_TEST_CORE)
+ androidTestImplementation(libs.truth)
+ debugImplementation(libs.testCore)
debugImplementation("androidx.fragment:fragment-testing:1.2.3")
// camera-testing added as 'implementation' dependency to include camera-testing activity in APK
debugImplementation(project(":camera:camera-testing")) {
