From 5928989546a4e3f57190c2f7368b899470476528 Mon Sep 17 00:00:00 2001
From: Neel Doshi <neeldoshi147@gmail.com>
Date: Sat, 6 Jul 2024 08:33:57 +0530
Subject: [PATCH] Deps: Migrated `googleMaterial` to Version Catalog

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

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 80d017a9de84..bb670f97409f 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -416,7 +416,7 @@ dependencies {
     implementation libs.androidx.appcompat.resources
     implementation libs.androidx.cardView
     implementation libs.androidx.recyclerView
-    implementation "com.google.android.material:material:$googleMaterialVersion"
+    implementation libs.google.material
     implementation "com.google.android.flexbox:flexbox:$googleFlexboxlayoutVersion"
     implementation "androidx.percentlayout:percentlayout:$androidxPercentlayoutVersion"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeToRefreshVersion"
diff --git a/build.gradle b/build.gradle
index e310e94bea19..2213e32863a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,6 @@ ext {
     googleAutoServiceVersion = '1.0.1'
     googleExoPlayerVersion = '2.13.3'
     googleFlexboxlayoutVersion = '3.0.0'
-    googleMaterialVersion = '1.9.0'
     googlePlayServicesCodeScannerVersion = '16.0.0-beta3'
     jsoupVersion = '1.16.2'
     philjayMpAndroidChartVersion = 'v3.1.0'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 728c7502431f..d2e10e314a1c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ eventBus = '3.3.1'
 facebookReact = '0.73.3'
 flipper = '0.245.0'
 glide = '4.16.0'
+googleMaterial = '1.9.0'
 googleMLKitBarcodeScanning = '17.2.0'
 googleMLKitBarcodeScanningCommon = '17.0.0'
 googleMLKitTextRecognition = '16.0.0'
@@ -118,6 +119,7 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="gli
 glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" }
 glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" }
 google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" }
 google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref ="googleMLKitBarcodeScanning" }
 google-mlkit-barcode-scanning-common = { group = "com.google.mlkit", name = "barcode-scanning-common", version.ref ="googleMLKitBarcodeScanningCommon" }
 google-mlkit-text-recognition = { group = "com.google.mlkit", name = "text-recognition", version.ref ="googleMLKitTextRecognition" }
diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
index 534abdc4b3f5..c59bcd782a92 100644
--- a/libs/editor/build.gradle
+++ b/libs/editor/build.gradle
@@ -103,7 +103,7 @@ dependencies {
     implementation libs.androidx.fragment
     implementation libs.androidx.appcompat
     implementation "androidx.preference:preference:$androidxPreferenceVersion"
-    implementation "com.google.android.material:material:$googleMaterialVersion"
+    implementation libs.google.material
     implementation libs.volley
     implementation libs.google.gson
     implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion"
diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
index 78c34f8c76c9..f4189006c4ef 100644
--- a/libs/image-editor/build.gradle
+++ b/libs/image-editor/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     implementation libs.androidx.recyclerView
     implementation libs.androidx.constraintLayout
     implementation "androidx.viewpager2:viewpager2:$androidxViewpager2Version"
-    implementation "com.google.android.material:material:$googleMaterialVersion"
+    implementation libs.google.material
     implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion"
     implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion"
     implementation libs.androidx.lifecycle.common