diff --git a/build.gradle b/build.gradle index 356605f2a..093a4fcd2 100644 --- a/build.gradle +++ b/build.gradle @@ -146,13 +146,6 @@ allprojects { // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ //////////////////////////////////////////////////////////////////////////////// - // Leanplum - // The docs mention a custom repository (repo.leanplum.com) that we may be able - // to switch to. - includeVersion("com.leanplum", "leanplum-core", "5.4.0") - includeVersion("com.leanplum", "leanplum-push", "5.4.0") - includeVersion("com.leanplum", "leanplum-fcm", "5.4.0") - // Used by Android Gradle Plugin // Issue for publishing to maven central: https://youtrack.jetbrains.com/issue/IDEA-261387 // Related plugin issue: https://issuetracker.google.com/issues/179291081 @@ -174,6 +167,18 @@ allprojects { } } } + + maven { + name "LeanplumRepo" + if (project.hasProperty("leanplumRepo")) { + url project.property("leanplumRepo") + } else { + url "https://repo.leanplum.com" + } + content { + includeGroup("com.leanplum") + } + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh index 7117fe288..ece18653a 100755 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh @@ -19,7 +19,7 @@ pushd $PROJECT_DIR . taskcluster/scripts/toolchain/android-gradle-dependencies/before.sh NEXUS_PREFIX='http://localhost:8081/nexus/content/repositories' -GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PjcenterRepo=$NEXUS_PREFIX/jcenter/ -PcentralRepo=$NEXUS_PREFIX/central/" +GRADLE_ARGS="--parallel -PgoogleRepo=$NEXUS_PREFIX/google/ -PjcenterRepo=$NEXUS_PREFIX/jcenter/ -PcentralRepo=$NEXUS_PREFIX/central/ -PleanplumRepo=$NEXUS_PREFIX/leanplum/" # We build everything to be sure to fetch all dependencies ./gradlew $GRADLE_ARGS assemble assembleAndroidTest testClasses ktlint detekt # Some tests may be flaky, although they still download dependencies. So we let the following diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh index eed8d01fb..430974e5a 100644 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh @@ -23,6 +23,7 @@ mkdir -p android-gradle-dependencies /builds/worker/artifacts cp -R ${NEXUS_WORK}/storage/jcenter android-gradle-dependencies cp -R ${NEXUS_WORK}/storage/google android-gradle-dependencies cp -R ${NEXUS_WORK}/storage/central android-gradle-dependencies +cp -R ${NEXUS_WORK}/storage/leanplum android-gradle-dependencies tar cf - android-gradle-dependencies | xz > /builds/worker/artifacts/android-gradle-dependencies.tar.xz diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml index 2b40bedf3..1dfc16205 100644 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml @@ -54,6 +54,37 @@ true + + leanplum + leanplum + org.sonatype.nexus.proxy.repository.Repository + maven2 + IN_SERVICE + true + 1440 + true + true + true + READ_ONLY + true + true + + file + + + https://repo.leanplum.com/ + + + RELEASE + STRICT + true + false + -1 + 1440 + 1440 + true + + gradle-plugins Gradle Plugins