diff --git a/android-commons-root.gradle b/android-commons-root.gradle new file mode 100644 index 000000000..8fbb66c0d --- /dev/null +++ b/android-commons-root.gradle @@ -0,0 +1 @@ +// Minimal root build file used when android-client is included as a subproject. 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..94fbb2e30 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' diff --git a/http/build.gradle b/http/build.gradle index a7367b06e..0d046542b 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' 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'