Migrate wordPressUtils to Version Catalog

neeldoshii · Jul 10, 2024 · a21a674 · a21a674
1 parent b47b855
commit a21a674
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -373,9 +373,11 @@ dependencies {
         exclude group: 'org.wordpress', module: 'utils'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") {
+    // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml).
+    // noinspection UseTomlInstead
+    implementation ("$gradle.ext.wputilsBinaryPath:${libs.versions.wordPressUtils.get()}") {
         version {
-            strictly wordPressUtilsVersion
+            strictly libs.versions.wordPressUtils.get()
         }
     }
     implementation ("$gradle.ext.loginFlowBinaryPath:$wordPressLoginVersion") {

diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,6 @@ ext {
     wordPressAztecVersion = 'v2.1.3'
     wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
     wordPressLoginVersion = '1.16.0'
-    wordPressUtilsVersion = '3.14.0'
     gravatarVersion = '1.0.0'
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -80,6 +80,7 @@ volley = '1.2.1'
 wiremock = '2.26.3'
 wiremockHttpClient = '4.3.5.1'
 wordPressPersistentEditText = '1.0.2'
+wordPressUtils = '3.14.0'
 wordressLint = '2.1.0'
 zendesk = '5.1.2'
 
@@ -216,6 +217,7 @@ wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref ="
 wiremock-httpclient-android = { group = "org.apache.httpcomponents", name = "httpclient-android", version.ref ="wiremockHttpClient" }
 wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordressLint" }
 wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" }
+wordpress-utils = { group = "org.wordpress", name = "utils", version.ref = "wordPressUtils" }
 zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" }
 
 [plugins]

diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion"
-    implementation "org.wordpress:utils:$wordPressUtilsVersion"
+    implementation libs.wordpress.utils
 
     implementation libs.androidx.preference
 

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -59,7 +59,7 @@ android {
 dependencies {
     implementation ("$gradle.ext.wputilsBinaryPath") {
         version {
-            strictly wordPressUtilsVersion
+            strictly libs.versions.wordPressUtils.get()
         }
     }
     api ("$gradle.ext.aztecAndroidAztecPath") {
@@ -94,7 +94,7 @@ dependencies {
         exclude module: 'react-android'
     }
 
-    implementation "org.wordpress:utils:$wordPressUtilsVersion"
+    implementation libs.wordpress.utils
 
     implementation libs.androidx.lifecycle.common
     implementation libs.androidx.lifecycle.runtime

diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation (libs.automattic.rest) {
         exclude group: 'com.mcxiaoke.volley'
     }
-    implementation "org.wordpress:utils:$wordPressUtilsVersion"
+    implementation libs.wordpress.utils
 
     implementation libs.volley
     implementation libs.androidx.annotation