Deps: Migrated androidxTest to Version Catalog

neeldoshii · Jul 5, 2024 · d1aed0d · d1aed0d
1 parent 409c5cb
commit d1aed0d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -491,7 +491,7 @@ dependencies {
     androidTestImplementation libs.mockito.android
     androidTestImplementation libs.mockito.kotlin
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$squareupMockWebServerVersion"
-    androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidxTestUiAutomatorVersion"
+    androidTestImplementation libs.androidx.test.ui.automator
     androidTestImplementation libs.androidx.test.espresso.core, {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
@@ -508,9 +508,9 @@ dependencies {
         exclude group: 'org.json', module: 'json'
     }
     androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion"
-    androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion"
-    androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion"
-    androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion"
+    androidTestImplementation libs.androidx.test.runner
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion",  {
         exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
     }

diff --git a/build.gradle b/build.gradle
@@ -72,9 +72,6 @@ ext {
     zendeskVersion = '5.1.2'
 
     // android test
-    androidxTestCoreVersion = '1.5.0'
-    androidxTestExtJunitVersion = '1.1.5'
-    androidxTestUiAutomatorVersion = '2.2.0'
     screengrabVersion = '2.1.1'
     squareupMockWebServerVersion = '4.12.0'
     wiremockVersion = '2.26.3'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,10 @@ androidxComposeNavigation = '2.7.6'
 androidxCore = '1.10.0'
 androidxFragment = '1.6.2'
 androidxLifecycle = '2.6.2'
+androidxTest = '1.5.0'
 androidxTestEspresso = '3.4.0'
+androidxTestExtJunit = '1.1.5'
+androidxTestUiAutomator = '2.2.0'
 androidxWebkit =  '1.11.0'
 androidxWorkManager = "2.9.0"
 assertj = '3.23.1'
@@ -74,6 +77,10 @@ androidx-navigation = { group = "androidx.navigation", name = "navigation-compos
 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-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref ="androidxTestExtJunit" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref ="androidxTest" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref ="androidxTest" }
+androidx-test-ui-automator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref ="androidxTestUiAutomator" }
 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
@@ -78,6 +78,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-core-utils'
     })
 
-    androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion"
+    androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation(libs.androidx.test.espresso.core)
 }