Migrated wordPressFluxC to Version Catalog

neeldoshii · Jul 10, 2024 · fc85e24 · fc85e24
1 parent b6510ef
commit fc85e24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -365,9 +365,11 @@ dependencies {
     implementation (project(path:':libs:editor')) {
         exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") {
+    // TODO: Migrate from composite build path modules to version catalogs (libs.version.toml).
+    // noinspection UseTomlInstead
+    implementation("$gradle.ext.fluxCBinaryPath:${libs.versions.wordPressFluxC.get()}") {
         version {
-            strictly wordPressFluxCVersion
+            strictly libs.versions.wordPressFluxC.get()
         }
         exclude group: "com.android.volley"
         exclude group: 'org.wordpress', module: 'utils'

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,6 @@ ext {
 ext {
     // libs
     gutenbergMobileVersion = 'v1.120.1'
-    wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
 }
 
 measureBuilds {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -83,6 +83,7 @@ volley = '1.2.1'
 wiremock = '2.26.3'
 wiremockHttpClient = '4.3.5.1'
 wordPressAztec = 'v2.1.3'
+wordPressFluxC = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
 wordPressLint = '2.1.0'
 wordPressLogin = '1.16.0'
 wordPressPersistentEditText = '1.0.2'
@@ -159,8 +160,8 @@ androidx-work-testing = { group = "androidx.work", name = "work-testing", versio
 apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" }
 assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" }
 automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" }
-automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" }
 automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automatticTracks" }
+automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" }
 cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" }
 chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" }
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" }