From 6b453b96a3ddfe46c5a486d63b319828dabb5341 Mon Sep 17 00:00:00 2001
From: Neel Doshi <neeldoshi147@gmail.com>
Date: Fri, 5 Jul 2024 16:00:24 +0530
Subject: [PATCH] Deps: Migrated `TestEspresso` to Version Catalog

---
 WordPress/build.gradle         | 16 +++-------------
 build.gradle                   |  1 -
 gradle/libs.versions.toml      |  4 ++++
 libs/image-editor/build.gradle |  6 +-----
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 686bdfc7732b..c1b5666bba41 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -492,25 +492,15 @@ dependencies {
     androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion"
     androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxTestEspressoVersion", {
-        version {
-            strictly androidxTestEspressoVersion
-        }
+    androidTestImplementation libs.androidx.test.espresso.core, {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidxTestEspressoVersion") {
-        version {
-            strictly androidxTestEspressoVersion
-        }
+    androidTestImplementation(libs.androidx.test.espresso.contrib) {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude module: 'recyclerview-v7'
     }
-    androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidxTestEspressoVersion") {
-        version {
-            strictly androidxTestEspressoVersion
-        }
-    }
+    androidTestImplementation(libs.androidx.test.espresso.accessibility)
     androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
         exclude group: 'org.apache.commons', module: 'commons-lang3'
diff --git a/build.gradle b/build.gradle
index 7b9c03f5b195..1fdad7ae2cde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,6 @@ ext {
 
     // android test
     androidxTestCoreVersion = '1.5.0'
-    androidxTestEspressoVersion = '3.4.0'
     androidxTestExtJunitVersion = '1.1.5'
     androidxTestUiAutomatorVersion = '2.2.0'
     screengrabVersion = '2.1.1'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f62e6f4de338..c140593acdb4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ androidxComposeNavigation = '2.7.6'
 androidxCore = '1.10.0'
 androidxFragment = '1.6.2'
 androidxLifecycle = '2.6.2'
+androidxTestEspresso = '3.4.0'
 androidxWebkit =  '1.11.0'
 androidxWorkManager = "2.9.0"
 automatticRest = '1.0.8'
@@ -61,6 +62,9 @@ androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "l
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }
 androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" }
 androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" }
+androidx-test-espresso-accessibility = { group = "androidx.test.espresso", name = "espresso-accessibility", version.ref ="androidxTestEspresso" }
+androidx-test-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref ="androidxTestEspresso" }
+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref ="androidxTestEspresso" }
 androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"}
 androidx-workManager-runtime = { group = "androidx.work", name = "work-runtime", version.ref = "androidxWorkManager" }
 androidx-workManager-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWorkManager" }
diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
index d45779f1f73a..b849078374e4 100644
--- a/libs/image-editor/build.gradle
+++ b/libs/image-editor/build.gradle
@@ -79,9 +79,5 @@ dependencies {
     })
 
     androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion"
-    androidTestImplementation("androidx.test.espresso:espresso-core:$androidxTestEspressoVersion") {
-        version {
-            strictly androidxTestEspressoVersion
-        }
-    }
+    androidTestImplementation(libs.androidx.test.espresso.core)
 }