Deps: Migrated androidxArchCore to Version Catalog

neeldoshii · Jul 5, 2024 · 6c6d268 · 6c6d268
1 parent 4cb591e
commit 6c6d268
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -399,8 +399,8 @@ dependencies {
     implementation libs.android.appUpdate
     implementation libs.android.appUpdateKtx
 
-    implementation "androidx.arch.core:core-common:$androidxArchCoreVersion"
-    implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion"
+    implementation libs.androidx.coreCommon
+    implementation libs.androidx.coreRuntime
     implementation "com.google.code.gson:gson:$googleGsonVersion"
     implementation "androidx.core:core:$androidxCoreVersion"
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
@@ -475,7 +475,7 @@ dependencies {
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
     ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
-    testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
+    testImplementation(libs.androidx.coreTesting, {
         exclude group: 'com.android.support', module: 'support-compat'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-core-utils'

diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,6 @@ ext {
     androidVolleyVersion = '1.2.1'
     androidxAnnotationVersion = '1.6.0'
     androidxAppcompatVersion = '1.6.1'
-    androidxArchCoreVersion = '2.2.0'
     androidxCameraVersion = '1.3.4'
     androidxComposeBomVersion = '2023.10.00'
     androidxComposeCompilerVersion = '1.5.9'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+androidxArchCore = '2.2.0'
 androidxComposeNavigation = '2.7.6'
 androidxWebkit =  '1.11.0'
 automatticRest = '1.0.8'
@@ -8,6 +9,9 @@ wordPressPersistentEditText = '1.0.2'
 [libraries]
 android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" }
 android-appUpdateKtx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "googlePlayAppUpdate" }
+androidx-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" }
+androidx-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" }
+androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" }
 androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" }
 androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"}
 automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" }

diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.assertj:assertj-core:$assertjVersion"
-    testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
+    testImplementation(libs.androidx.coreTesting, {
         exclude group: 'com.android.support', module: 'support-compat'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-core-utils'