From 48b279206a4d23b4b0ae4c64d9e4fac0385dd69d Mon Sep 17 00:00:00 2001
From: Neel Doshi <neeldoshi147@gmail.com>
Date: Sat, 6 Jul 2024 06:28:52 +0530
Subject: [PATCH] Deps: Migrated `constraintLayout` to Version Catalog

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

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 07ed2bf66032..dfa4af3d77e9 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -423,7 +423,7 @@ dependencies {
     implementation "androidx.preference:preference:$androidxPreferenceVersion"
     implementation libs.androidx.workManager.runtime
     implementation libs.androidx.workManager.runtime.ktx
-    implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion"
+    implementation libs.androidx.constraintLayout
     implementation libs.androidx.lifecycle.viewmodel
     implementation libs.androidx.lifecycle.viewmodel.ktx
     implementation libs.androidx.lifecycle.livedata.core
diff --git a/build.gradle b/build.gradle
index 3b40bcc4ea89..f4daa172a424 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,6 @@ ext {
     androidxAnnotationVersion = '1.6.0'
     androidxComposeBomVersion = '2023.10.00'
     androidxComposeCompilerVersion = '1.5.9'
-    androidxConstraintlayoutVersion = '2.1.4'
     androidxConstraintlayoutComposeVersion = '1.0.1'
     androidxGridlayoutVersion = '1.0.0'
     androidxPercentlayoutVersion = '1.0.0'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9e9899027696..6a0d96e41a50 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ androidxArchCore = '2.2.0'
 androidxCamera = '1.3.4'
 androidxCardview = '1.0.0'
 androidxComposeNavigation = '2.7.6'
+androidxConstraintlayout = '2.1.4'
 androidxCore = '1.10.0'
 androidxFragment = '1.6.2'
 androidxLifecycle = '2.6.2'
@@ -60,6 +61,7 @@ androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-juni
 androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit" }
+androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintlayout" }
 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" }
diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
index 1c52f8084ffc..c221d7cd5e07 100644
--- a/libs/image-editor/build.gradle
+++ b/libs/image-editor/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation libs.androidx.fragment
     implementation libs.androidx.appcompat
     implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion"
-    implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion"
+    implementation libs.androidx.constraintLayout
     implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version"
     implementation "com.google.android.material:material:$googleMaterialVersion"
     implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion"