Deps: Migrated androidxCore to Version Catalog

neeldoshii · Jul 5, 2024 · cbc748a · cbc748a
1 parent 45371b7
commit cbc748a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -402,8 +402,8 @@ dependencies {
     implementation libs.androidx.coreCommon
     implementation libs.androidx.coreRuntime
     implementation libs.google.gson
-    implementation "androidx.core:core:$androidxCoreVersion"
-    implementation "androidx.core:core-ktx:$androidxCoreVersion"
+    implementation libs.androidx.core
+    implementation libs.androidx.core.ktx
     implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion"

diff --git a/build.gradle b/build.gradle
@@ -46,7 +46,6 @@ ext {
     androidxCardviewVersion = '1.0.0'
     androidxConstraintlayoutVersion = '2.1.4'
     androidxConstraintlayoutComposeVersion = '1.0.1'
-    androidxCoreVersion = '1.10.0'
     androidxActivityVersion = '1.8.0'
     androidxFragmentVersion = '1.6.2'
     androidxGridlayoutVersion = '1.0.0'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 androidxArchCore = '2.2.0'
 androidxComposeNavigation = '2.7.6'
+androidxCore = '1.10.0'
 androidxWebkit =  '1.11.0'
 automatticRest = '1.0.8'
 googlePlayAppUpdate = '2.1.0'
@@ -10,6 +11,8 @@ 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-core = { group = "androidx.core", name = "core", version.ref = "androidxCore" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
 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" }

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion"
-    implementation "androidx.core:core:$androidxCoreVersion"
+    implementation libs.androidx.core
     implementation "androidx.fragment:fragment:$androidxFragmentVersion"
     implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion"
     implementation "androidx.preference:preference:$androidxPreferenceVersion"

diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
@@ -46,7 +46,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "androidx.core:core:$androidxCoreVersion"
+    implementation libs.androidx.core
     implementation "androidx.activity:activity:$androidxActivityVersion"
     implementation "androidx.activity:activity-ktx:$androidxActivityVersion"
     implementation "androidx.fragment:fragment:$androidxFragmentVersion"