Skip to content

Commit fc85e24

Browse files
committed
Migrated wordPressFluxC to Version Catalog
1 parent b6510ef commit fc85e24

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

WordPress/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,11 @@ dependencies {
365365
implementation (project(path:':libs:editor')) {
366366
exclude group: 'org.wordpress', module: 'utils'
367367
}
368-
implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") {
368+
// TODO: Migrate from composite build path modules to version catalogs (libs.version.toml).
369+
// noinspection UseTomlInstead
370+
implementation("$gradle.ext.fluxCBinaryPath:${libs.versions.wordPressFluxC.get()}") {
369371
version {
370-
strictly wordPressFluxCVersion
372+
strictly libs.versions.wordPressFluxC.get()
371373
}
372374
exclude group: "com.android.volley"
373375
exclude group: 'org.wordpress', module: 'utils'

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ ext {
2626
ext {
2727
// libs
2828
gutenbergMobileVersion = 'v1.120.1'
29-
wordPressFluxCVersion = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
3029
}
3130

3231
measureBuilds {

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ volley = '1.2.1'
8383
wiremock = '2.26.3'
8484
wiremockHttpClient = '4.3.5.1'
8585
wordPressAztec = 'v2.1.3'
86+
wordPressFluxC = 'trunk-79f2bc35285748c715e00f2a6648ed6831632178'
8687
wordPressLint = '2.1.0'
8788
wordPressLogin = '1.16.0'
8889
wordPressPersistentEditText = '1.0.2'
@@ -159,8 +160,8 @@ androidx-work-testing = { group = "androidx.work", name = "work-testing", versio
159160
apache-commons-text = { group = "org.apache.commons", name = "commons-text", version.ref ="apacheCommonsText" }
160161
assertj-core = { group = "org.assertj", name = "assertj-core", version.ref ="assertj" }
161162
automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" }
162-
automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" }
163163
automattic-tracks-android = { group = "com.automattic", name = "Automattic-Tracks-Android", version.ref = "automatticTracks" }
164+
automattic-tracks-crashlogging = { group = "com.automattic.tracks", name = "crashlogging", version.ref = "automatticTracks" }
164165
cascade-compose = { group = "me.saket.cascade", name = "cascade-compose", version.ref ="cascadeCompose" }
165166
chrisbanes-photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref ="chrisbanesPhotoview" }
166167
coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref ="coilCompose" }

0 commit comments

Comments
 (0)