From bd33f407debff6dc9bfc78898d7cfcd9f0a252e5 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Mon, 23 Feb 2026 08:52:28 -0300 Subject: [PATCH 1/3] Fix config for reustability of modules --- android-commons-root.gradle | 3 +++ api/build.gradle | 2 +- build.gradle | 4 ++-- events-domain/build.gradle | 2 +- events/build.gradle | 2 +- gradle/common-android-library.gradle | 2 +- http-api/build.gradle | 4 ++-- http/build.gradle | 6 +++--- logger/build.gradle | 2 +- main/build.gradle | 4 ++-- 10 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 android-commons-root.gradle diff --git a/android-commons-root.gradle b/android-commons-root.gradle new file mode 100644 index 000000000..3e59b4289 --- /dev/null +++ b/android-commons-root.gradle @@ -0,0 +1,3 @@ +// Minimal root build file used when android-client is included in the POC project. +// The full android-client/build.gradle references submodules (:main, :events, etc.) +// that are not included here, so we use this stub instead. diff --git a/api/build.gradle b/api/build.gradle index c32f26549..5574e9232 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.api' diff --git a/build.gradle b/build.gradle index a947d08b6..d5d84156c 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { apply plugin: 'com.android.fused-library' apply plugin: 'com.vanniktech.maven.publish' -apply from: "$rootDir/gradle/jacoco-root.gradle" +apply from: "$projectDir/gradle/jacoco-root.gradle" ext { splitVersion = '5.5.0' @@ -68,7 +68,7 @@ tasks.register('sonar') { if (sonarOrg) cmd.add("-Dsonar.organization=${sonarOrg}") cmd.add("-Dsonar.projectVersion=${splitVersion}") - def proc = new ProcessBuilder(cmd).directory(rootDir).inheritIO().start() + def proc = new ProcessBuilder(cmd).directory(projectDir).inheritIO().start() if (proc.waitFor() != 0) { throw new GradleException("sonar-scanner failed") } diff --git a/events-domain/build.gradle b/events-domain/build.gradle index 04cbce16f..6feac5d0b 100644 --- a/events-domain/build.gradle +++ b/events-domain/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.events' diff --git a/events/build.gradle b/events/build.gradle index b4a4d8ee9..a07072db1 100644 --- a/events/build.gradle +++ b/events/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.harness.events' diff --git a/gradle/common-android-library.gradle b/gradle/common-android-library.gradle index fe96407c8..b05c20aac 100644 --- a/gradle/common-android-library.gradle +++ b/gradle/common-android-library.gradle @@ -30,4 +30,4 @@ if (kotlinCompileClass != null) { } // Enable Jacoco coverage configuration for all Android library modules -apply from: "$rootDir/gradle/jacoco-android.gradle" +apply from: "$projectDir/../gradle/jacoco-android.gradle" diff --git a/http-api/build.gradle b/http-api/build.gradle index 7e915b5f3..458017b0f 100644 --- a/http-api/build.gradle +++ b/http-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.network.api' @@ -15,7 +15,7 @@ android { dependencies { implementation libs.annotation - implementation project(':logger') + implementation project(':android-client:logger') testImplementation libs.junit4 testImplementation libs.mockitoCore diff --git a/http/build.gradle b/http/build.gradle index a7367b06e..442c1dd7f 100644 --- a/http/build.gradle +++ b/http/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.network.http' @@ -15,8 +15,8 @@ android { dependencies { implementation libs.annotation - implementation project(':logger') - api project(':http-api') + implementation project(':android-client:logger') + api project(':android-client:http-api') testImplementation libs.junit4 testImplementation libs.mockitoCore diff --git a/logger/build.gradle b/logger/build.gradle index a45c8cd36..0cc88bb53 100644 --- a/logger/build.gradle +++ b/logger/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.logger' diff --git a/main/build.gradle b/main/build.gradle index 63f91db29..362b7508f 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -2,14 +2,14 @@ plugins { id 'com.android.library' } -apply from: "$rootDir/gradle/common-android-library.gradle" +apply from: "$projectDir/../gradle/common-android-library.gradle" android { namespace 'io.split.android.client.main' defaultConfig { multiDexEnabled true - consumerProguardFiles "$rootDir/split-proguard-rules.pro" + consumerProguardFiles "$projectDir/../split-proguard-rules.pro" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments clearPackageData: 'true' From 2dcb7d4565f373084c6e8c284fa54ad7a0af5a03 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Fri, 27 Feb 2026 10:47:20 -0300 Subject: [PATCH 2/3] Reference logger module correctly --- http-api/build.gradle | 2 +- http/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/http-api/build.gradle b/http-api/build.gradle index 458017b0f..94fbb2e30 100644 --- a/http-api/build.gradle +++ b/http-api/build.gradle @@ -15,7 +15,7 @@ android { dependencies { implementation libs.annotation - implementation project(':android-client:logger') + implementation project(':logger') testImplementation libs.junit4 testImplementation libs.mockitoCore diff --git a/http/build.gradle b/http/build.gradle index 442c1dd7f..0d046542b 100644 --- a/http/build.gradle +++ b/http/build.gradle @@ -15,8 +15,8 @@ android { dependencies { implementation libs.annotation - implementation project(':android-client:logger') - api project(':android-client:http-api') + implementation project(':logger') + api project(':http-api') testImplementation libs.junit4 testImplementation libs.mockitoCore From cb16ac121ebe2e0cdb72632103d8a9850fa19b94 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Fri, 27 Feb 2026 10:51:16 -0300 Subject: [PATCH 3/3] Fix comment --- android-commons-root.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android-commons-root.gradle b/android-commons-root.gradle index 3e59b4289..8fbb66c0d 100644 --- a/android-commons-root.gradle +++ b/android-commons-root.gradle @@ -1,3 +1 @@ -// Minimal root build file used when android-client is included in the POC project. -// The full android-client/build.gradle references submodules (:main, :events, etc.) -// that are not included here, so we use this stub instead. +// Minimal root build file used when android-client is included as a subproject.