From 0eee71d0cf16df5cac8d2b86e6f60fb4c5effe69 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Wed, 26 May 2021 15:23:53 +0200 Subject: [PATCH] Closes #17819: Remove JCenter from build files. --- build.gradle | 19 ------------ buildSrc/src/main/java/Dependencies.kt | 4 +-- taskcluster/fenix_taskgraph/job.py | 2 +- .../toolchain/android-gradle-dependencies.sh | 2 +- .../android-gradle-dependencies/after.sh | 1 - .../android-gradle-dependencies/nexus.xml | 31 ------------------- 6 files changed, 4 insertions(+), 55 deletions(-) diff --git a/build.gradle b/build.gradle index a68ebca0d..ef36e1705 100644 --- a/build.gradle +++ b/build.gradle @@ -132,25 +132,6 @@ allprojects { } } } - - if (project.hasProperty("jcenterRepo")) { - maven { - name "BintrayJCenter" - url project.property("jcenterRepo") - } - } else { - jcenter() { - content { - //////////////////////////////////////////////////////////////////////////////// - // JCenter is going away. Please do not add any new dependencies here. - // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ - //////////////////////////////////////////////////////////////////////////////// - - // Fastlane - // Both Screengrab and falcon are available on Maven Central - } - } - } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index be5e5f7bb..10e683ab1 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -248,8 +248,8 @@ object RepoMatching { /** * A matcher for com.google.android.* with one exception: the espresso-contrib dependency includes the * accessibility-test-framework dependency, which is not available in the google repo. As such, we must - * explicitly exclude it from this regex so it can be found on jcenter. Note that the transitive dependency - * com.google.guava is also not available on google's repo. + * explicitly exclude it from this regex so it can be found on Maven Central. Note that the transitive + * dependency com.google.guava is also not available on google's repo. */ const val comGoogleAndroid = "com\\.google\\.android\\.(?!apps\\.common\\.testing\\.accessibility\\.framework).*" } diff --git a/taskcluster/fenix_taskgraph/job.py b/taskcluster/fenix_taskgraph/job.py index a289a31d7..0f33ec5e4 100644 --- a/taskcluster/fenix_taskgraph/job.py +++ b/taskcluster/fenix_taskgraph/job.py @@ -99,7 +99,7 @@ def _extract_gradlew_command(run, fetches_dir): "-P{repo_name}Repo=file://{dir}/{repo_name}".format( dir=maven_dependencies_dir, repo_name=repo_name ) - for repo_name in ("google", "jcenter") + for repo_name in ("google", "central") ] gradle_command = ["./gradlew"] + gradle_repos_args + ["listRepositories"] + run.pop("gradlew") post_gradle_commands = run.pop("post-gradlew", []) diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh index 7117fe288..90777def3 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/ -PcentralRepo=$NEXUS_PREFIX/central/" # 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..0dc8cc208 100644 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh @@ -20,7 +20,6 @@ set -v pushd $WORKSPACE 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 diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml index 2b40bedf3..64e4c9633 100644 --- a/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml +++ b/taskcluster/scripts/toolchain/android-gradle-dependencies/nexus.xml @@ -23,37 +23,6 @@ true - - jcenter - jcenter - org.sonatype.nexus.proxy.repository.Repository - maven2 - IN_SERVICE - true - 1440 - true - true - true - READ_ONLY - true - true - - file - - - https://jcenter.bintray.com/ - - - RELEASE - STRICT - true - false - -1 - 1440 - 1440 - true - - gradle-plugins Gradle Plugins