Skip to content

Commit

Permalink
Use local fluxc
Browse files Browse the repository at this point in the history
  • Loading branch information
wzieba committed Sep 26, 2024
1 parent e1e11e9 commit 3f369ab
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 13 deletions.
9 changes: 1 addition & 8 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -411,14 +411,7 @@ dependencies {
implementation (project(path:':libs:editor')) {
exclude group: 'org.wordpress', module: 'utils'
}
implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") {
version {
strictly wordPressFluxCVersion
}
exclude group: "com.android.volley"
exclude group: 'org.wordpress', module: 'utils'
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation project(':fluxc')
implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") {
version {
strictly wordPressUtilsVersion
Expand Down
12 changes: 10 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ plugins {
id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" apply false
id "androidx.navigation.safeargs.kotlin" apply false
id "com.android.library" apply false
id "org.jetbrains.kotlin.android" apply false
id "org.jetbrains.kotlin.kapt" apply false
id 'com.google.gms.google-services' apply false
id "org.jetbrains.kotlin.plugin.parcelize" apply false
id "com.google.devtools.ksp" apply false
Expand All @@ -28,7 +30,6 @@ ext {
automatticTracksVersion = '5.1.0'
gutenbergMobileVersion = 'v1.121.0'
wordPressAztecVersion = 'v2.1.4'
wordPressFluxCVersion = 'trunk-a77c116b8bd00247c8c0551b4497629ff84ca023'
wordPressLoginVersion = '1.16.0'
wordPressPersistentEditTextVersion = '1.0.2'
wordPressRsVersion = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1'
Expand Down Expand Up @@ -150,6 +151,13 @@ allprojects {
includeVersion "com.jraska", "falcon", "2.1.1"
}
}
maven {
url "https://a8c-libs.s3.amazonaws.com/android"
content {
includeGroup "org.wordpress"
includeGroup "org.wordpress.wellsql"
}
}
}

tasks.register("checkstyle", Checkstyle) {
Expand Down Expand Up @@ -178,7 +186,7 @@ allprojects {
tasks.withType(KotlinCompile).all {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
allWarningsAsErrors = true
allWarningsAsErrors = false
freeCompilerArgs += [
"-opt-in=kotlin.RequiresOptIn",
"-Xjvm-default=all"
Expand Down
2 changes: 1 addition & 1 deletion fluxc-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ java {
}

dependencies {
implementation fluxcAnnotationsProjectDependency
implementation project(':fluxc-annotations')
implementation sharedLibs.google.autoService
annotationProcessor sharedLibs.google.autoService
implementation sharedLibs.squareup.javapoet
Expand Down
4 changes: 2 additions & 2 deletions fluxc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ dependencies {
kapt sharedLibs.wellsql.processor

// FluxC annotations
api fluxcAnnotationsProjectDependency
kapt fluxcProcessorProjectDependency
api project(":fluxc-annotations")
kapt project(":fluxc-processor")

// External libs
api sharedLibs.eventbus.android
Expand Down
33 changes: 33 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pluginManagement {
id "com.google.devtools.ksp" version gradle.ext.kspVersion
id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion
id "com.osacky.fladle" version gradle.ext.fladleVersion
id "org.jetbrains.kotlin.kapt" version gradle.ext.kotlinVersion
}
repositories {
maven {
Expand All @@ -50,6 +51,36 @@ plugins {
id "com.gradle.develocity" version "3.18.1"
}

def catalogVersion = "1.23.1"
dependencyResolutionManagement {
repositories {
exclusiveContent {
forRepository {
maven {
url = uri("https://a8c-libs.s3.amazonaws.com/android")
}
}
filter {
includeModule("com.automattic", "dependency-catalog")
}
}
}
versionCatalogs {
sharedLibs {
from("com.automattic:dependency-catalog:$catalogVersion")

version("androidx-annotation", "1.0.2")
version("androidx-appcompat", "1.0.2")
version("androidx-constraintlayout", "1.1.3")
version("androidx-recyclerview", "1.0.0")
version("apache-commons-text", "1.10.0")
version("facebook-flipper", "0.51.0")
version("facebook-soloader", "0.9.0")

}
}
}

rootProject.name = 'WPAndroid'

include ':WordPress'
Expand All @@ -63,6 +94,8 @@ include ':libs:annotations'

include ':libs:mocks'

include ':fluxc', ':fluxc-annotations', ':fluxc-processor'

apply from: './config/gradle/included_builds.gradle'
apply from: './config/gradle/gradle_build_cache.gradle'
apply from: './config/gradle/gradle_build_scan.gradle'

0 comments on commit 3f369ab

Please sign in to comment.