diff --git a/amethyst/build.gradle b/amethyst/build.gradle index c7e5bb8e6..e0fd1eae7 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -300,11 +300,10 @@ dependencies { debugImplementation libs.androidx.ui.tooling debugImplementation libs.androidx.ui.test.manifest - def camerax_version = "1.3.4" - implementation "androidx.camera:camera-core:$camerax_version" - implementation "androidx.camera:camera-camera2:$camerax_version" - implementation "androidx.camera:camera-lifecycle:$camerax_version" - implementation "androidx.camera:camera-view:$camerax_version" - implementation "androidx.camera:camera-extensions:$camerax_version" + implementation libs.androidx.camera.core + implementation libs.androidx.camera.camera2 + implementation libs.androidx.camera.lifecycle + implementation libs.androidx.camera.view + implementation libs.androidx.camera.extensions } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f50fd11a8..6e1690e45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,6 +50,7 @@ zoomable = "1.6.2" zxing = "3.5.3" zxingAndroidEmbedded = "4.3.0" windowCoreAndroid = "1.3.0" +androidxCamera = "1.3.4" [libraries] abedElazizShe-image-compressor = { group = "com.github.AbedElazizShe", name = "LightCompressor", version.ref = "lightcompressor" } @@ -59,6 +60,11 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-comp androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmarkJunit4" } androidx-biometric-ktx = { group = "androidx.biometric", name = "biometric-ktx", version.ref = "biometricKtx" } +androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidxCamera" } +androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidxCamera" } +androidx-camera-extensions = { module = "androidx.camera:camera-extensions", version.ref = "androidxCamera" } +androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidxCamera" } +androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidxCamera" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } @@ -132,4 +138,4 @@ googleServices = { id = "com.google.gms.google-services", version.ref = "gms" } jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } jetbrainsKotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } jetbrainsComposeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -serialization = { id = 'org.jetbrains.kotlin.plugin.serialization', version.ref = 'kotlinxSerializationPlugin' } \ No newline at end of file +serialization = { id = 'org.jetbrains.kotlin.plugin.serialization', version.ref = 'kotlinxSerializationPlugin' }