From 6177e94660ab2dc34fcd0f5d91f2a10546e8fc0d Mon Sep 17 00:00:00 2001
From: Neel Doshi <neeldoshi147@gmail.com>
Date: Fri, 19 Jul 2024 00:14:30 +0530
Subject: [PATCH] Deps: Migrated `androidxCore` to Version Catalog

---
 WordPress/build.gradle         | 4 ++--
 build.gradle                   | 1 -
 gradle/libs.versions.toml      | 3 +++
 libs/editor/build.gradle       | 2 +-
 libs/image-editor/build.gradle | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 8162a6f3ee57..0b2d14e4c7d9 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -402,8 +402,8 @@ dependencies {
     implementation libs.androidx.arch.coreCommon
     implementation libs.androidx.arch.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
index 90b106f5ec71..3bc1404943b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,6 @@ ext {
     androidxCardviewVersion = '1.0.0'
     androidxConstraintlayoutVersion = '2.1.4'
     androidxConstraintlayoutComposeVersion = '1.0.1'
-    androidxCoreVersion = '1.10.0'
     androidxActivityVersion = '1.8.0'
     androidxFragmentVersion = '1.8.1'
     androidxGridlayoutVersion = '1.0.0'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8767a0f345b6..7f5c0419536f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 androidxArchCore = '2.2.0'
 androidxComposeNavigation = '2.7.7'
+androidxCore = '1.10.0'
 androidxWebkit =  '1.11.0'
 automatticRest = '1.0.8'
 googleGson = '2.10.1'
@@ -13,6 +14,8 @@ android-play-appUpdateKtx = { group = "com.google.android.play", name = "app-upd
 androidx-arch-coreCommon = { group = "androidx.arch.core", name = "core-common", version.ref = "androidxArchCore" }
 androidx-arch-coreRuntime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "androidxArchCore" }
 androidx-arch-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArchCore" }
+androidx-core = { group = "androidx.core", name = "core", version.ref = "androidxCore" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
 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/editor/build.gradle b/libs/editor/build.gradle
index d9925028ed43..59284cc59c73 100644
--- 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
index 95d11eacf992..c6f260c1be37 100644
--- 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"