Deps: Migrated wiremock to Version Catalog

neeldoshii · Jul 5, 2024 · 9b552a5 · 9b552a5
1 parent d1aed0d
commit 9b552a5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -501,13 +501,13 @@ dependencies {
         exclude module: 'recyclerview-v7'
     }
     androidTestImplementation(libs.androidx.test.espresso.accessibility)
-    androidTestImplementation("com.github.tomakehurst:wiremock:$wiremockVersion") {
+    androidTestImplementation(libs.wiremock) {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
         exclude group: 'org.apache.commons', module: 'commons-lang3'
         exclude group: 'asm', module: 'asm'
         exclude group: 'org.json', module: 'json'
     }
-    androidTestImplementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion"
+    androidTestImplementation libs.wiremock.httpclient.android
     androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.rules
     androidTestImplementation libs.androidx.test.ext.junit

diff --git a/build.gradle b/build.gradle
@@ -74,8 +74,6 @@ ext {
     // android test
     screengrabVersion = '2.1.1'
     squareupMockWebServerVersion = '4.12.0'
-    wiremockVersion = '2.26.3'
-    wiremockHttpClientVersion = '4.3.5.1'
 
     // other
     androidDesugarVersion = '2.0.4'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,6 +29,8 @@ mockitoAndroid = '4.5.1'
 mockitoKotlin = '4.1.0'
 soLoader = '0.10.5'
 wordPressPersistentEditText = '1.0.2'
+wiremock = '2.26.3'
+wiremockHttpClient = '4.3.5.1'
 
 [libraries]
 android-appUpdate = { group = "com.google.android.play", name = "app-update", version.ref = "googlePlayAppUpdate" }
@@ -111,6 +113,8 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie"
 lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" }
 mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" }
 mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" }
+wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="wiremock" }
+wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" }
 wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" }
 
 [plugins]

diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle
@@ -18,11 +18,11 @@ android {
 }
 
 dependencies {
-    implementation("com.github.tomakehurst:wiremock:$wiremockVersion") {
+    implementation(libs.wiremock) {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
         exclude group: 'org.apache.commons', module: 'commons-lang3'
         exclude group: 'asm', module: 'asm'
         exclude group: 'org.json', module: 'json'
     }
-    implementation "org.apache.httpcomponents:httpclient-android:$wiremockHttpClientVersion"
+    implementation libs.wiremock.httpclient.android
 }