Skip to content

Commit de0fed1

Browse files
committed
Update documentation, remove unused code related to including FluxC or Login Flow builds
1 parent d8f8556 commit de0fed1

File tree

5 files changed

+2
-30
lines changed

5 files changed

+2
-30
lines changed

WordPress/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ repositories {
9090
content {
9191
includeGroup "org.wordpress"
9292
includeGroup "org.wordpress.aztec"
93-
includeGroup "org.wordpress.fluxc"
9493
includeGroup "org.wordpress.wellsql"
9594
includeGroup "org.wordpress.gutenberg-mobile"
9695
includeGroup "org.wordpress.gutenbergkit"

config/gradle/included_builds.gradle

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
gradle.ext.fluxCBinaryPath = "org.wordpress:fluxc"
21
gradle.ext.wputilsBinaryPath = "org.wordpress:utils"
32
gradle.ext.gutenbergMobileBinaryPath = "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
43
gradle.ext.includedBuildGutenbergMobilePath = null
54
gradle.ext.gutenbergKitBinaryPath = "org.wordpress.gutenbergkit:android"
65
gradle.ext.includedBuildGutenbergKitPath = null
7-
gradle.ext.loginFlowBinaryPath = "org.wordpress:login"
86
gradle.ext.aztecAndroidAztecPath = "org.wordpress:aztec"
97
gradle.ext.aztecAndroidWordPressShortcodesPath = "org.wordpress.aztec:wordpress-shortcodes"
108
gradle.ext.aztecAndroidWordPressCommentsPath = "org.wordpress.aztec:wordpress-comments"
@@ -28,15 +26,6 @@ if (localBuilds.exists()) {
2826
https://docs.gradle.org/current/javadoc/org/gradle/api/initialization/ConfigurableIncludedBuild.html#dependencySubstitution-org.gradle.api.Action-
2927
*/
3028

31-
if (ext.has("localFluxCPath")) {
32-
includeBuild(ext.localFluxCPath) {
33-
dependencySubstitution {
34-
println "Substituting fluxc with the local build"
35-
substitute module("$gradle.ext.fluxCBinaryPath") using project(':fluxc')
36-
}
37-
}
38-
}
39-
4029
if (ext.has("localWPUtilsPath")) {
4130
includeBuild(ext.localWPUtilsPath) {
4231
dependencySubstitution {
@@ -66,15 +55,6 @@ if (localBuilds.exists()) {
6655
}
6756
}
6857

69-
if (ext.has("localLoginFlowPath")) {
70-
includeBuild(ext.localLoginFlowPath) {
71-
dependencySubstitution {
72-
println "Substituting login-flow with the local build"
73-
substitute module("$gradle.ext.loginFlowBinaryPath") using project(':WordPressLoginFlow')
74-
}
75-
}
76-
}
77-
7858
if (ext.has("localStoriesAndroidPath")) {
7959
includeBuild(ext.localStoriesAndroidPath) {
8060
dependencySubstitution {

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ squareup-retrofit = '2.11.0'
8888
violation-comments = '1.70.0'
8989
wiremock = '2.26.3'
9090
wordpress-aztec = 'v2.1.4'
91-
wordpress-fluxc = '2.99.0'
9291
wordpress-lint = '2.1.0'
93-
wordpress-login = '1.18.0'
9492
wordpress-persistent-edittext = '1.0.2'
9593
wordpress-rs = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1'
9694
wordpress-utils = '3.14.0'

libs/networking/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Networking
22

3-
Module for handling additional network requests that are not part of the main [WordPress-FluxC-Android] project and its data layer.
3+
Module for handling additional network requests that are not part of the `:libs:fluxc` module (previously [WordPress-FluxC-Android] project) and its data layer.
44

55
[WordPress-FluxC-Android]: https://github.com/wordpress-mobile/WordPress-FluxC-Android
66

local-builds.gradle-example

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,13 @@ in the project and substitute the binary dependency with the local one.
88

99
Once this file is updated Gradle will need to re-configure the project. (sync)
1010

11-
Please note that some included builds may be slow to compile. Specifically, as of Sep 25, 2020,
12-
making a change to FluxC can take around 2 minutes to build. This is something that'll hopefully
13-
get better with some build improvements, but in the meantime it might be best to prefer the
14-
binary build if you're not working on a specific library.
11+
Please note that some included builds may be slow to compile.
1512
*/
1613
ext {
1714
//localAboutAutomatticPath = "../about-automattic-android"
18-
//localFluxCPath = "../WordPress-FluxC-Android"
1915
//localWPUtilsPath = "../WordPress-Utils-Android"
2016
//localGutenbergMobilePath = "../gutenberg-mobile"
2117
//localGutenbergKitPath = "../GutenbergKit"
22-
//localLoginFlowPath = "../WordPress-Login-Flow-Android"
2318
//localAztecAndroidPath = "../AztecEditor-Android"
2419
//localGravatarAndroidPath = "../Gravatar-SDK-Android"
2520
}

0 commit comments

Comments
 (0)