From 9a923be8979ddd7da5ea3dc68232a7c36aa0380d Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 2 Jun 2021 09:56:08 -0700 Subject: [PATCH] remove jcenter (#31609) Summary: jcenter is read-only now, and newer versions of dependencies will be published to either MavenCentral or Jitpack. This PR removes jcenter to avoid future issues, then uses MavenCentral and Jitpack as replacement. Current flipper depends on Stetho version that is not available on MavenCentral, so had to exclude and bump the version. Both Gradle and Buck successfully download all the dependencies. ## Changelog [Android] [Changed] - Remove jcenter Pull Request resolved: https://github.com/facebook/react-native/pull/31609 Test Plan: rn-tester builds and runs as expected. Reviewed By: mdvacca Differential Revision: D28802444 Pulled By: ShikaSD fbshipit-source-id: 043ef079d0cda77a1f8dd732678452ed712741a4 --- .buckconfig | 1 - .editorconfig | 3 +++ ReactAndroid/build.gradle | 2 +- .../java/com/facebook/proguard/annotations/BUCK | 4 ++-- build.gradle.kts | 13 +------------ packages/react-native-codegen/android/build.gradle | 10 ---------- .../android/gradlePlugin-build/build.gradle | 5 ----- .../react-native-gradle-plugin/build.gradle.kts | 2 +- packages/rn-tester/android/app/build.gradle | 2 ++ template/android/app/build.gradle | 2 ++ template/android/build.gradle | 4 ++-- 11 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.buckconfig b/.buckconfig index 3d98e74d71e..07ec813646f 100644 --- a/.buckconfig +++ b/.buckconfig @@ -8,7 +8,6 @@ [maven_repositories] central = https://repo1.maven.org/maven2 google = https://maven.google.com/ - jcenter = https://jcenter.bintray.com/ [alias] rntester = //packages/rn-tester/android/app:app diff --git a/.editorconfig b/.editorconfig index 2e8c85b9738..355a800148a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,9 @@ indent_size = 2 [*.gradle] indent_size = 4 +[*.kts] +indent_size = 4 + [BUCK] indent_size = 4 diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index ceeb44c1b2e..a5b76249e34 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -436,7 +436,7 @@ android { dependencies { api("com.facebook.infer.annotation:infer-annotation:0.11.2") - api("com.facebook.yoga:proguard-annotations:1.17.0") + api("com.facebook.yoga:proguard-annotations:1.19.0") api("javax.inject:javax.inject:1") api("androidx.appcompat:appcompat:1.0.2") api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK index 660cbc63668..bae5e4f25e3 100644 --- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK @@ -9,8 +9,8 @@ rn_prebuilt_jar( fb_native.remote_file( name = "annotations-binary.jar", - sha1 = "95ff77fd4870136a0454dd7ccad8813db87bd9ab", - url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.17.0/proguard-annotations-1.17.0.jar", + sha1 = "fcbbb39052e6490eaaf6a6959c49c3a4fbe87c63", + url = "mvn:com.facebook.yoga:proguard-annotations:jar:1.19.0", ) rn_android_library( diff --git a/build.gradle.kts b/build.gradle.kts index 42b4d82d932..47d59f05b27 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,11 +10,6 @@ buildscript { mavenLocal() google() mavenCentral() - jcenter { - content { - includeModule("org.jetbrains.trove4j", "trove4j") - } - } } dependencies { classpath("com.android.tools.build:gradle:4.2.1") @@ -38,16 +33,10 @@ allprojects { mavenLocal() google() mavenCentral() - jcenter { - content { - includeModule("com.facebook.yoga", "proguard-annotations") - includeModule("com.facebook.fresco", "stetho") - } - } } // used to override ndk path on CI if (System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) { - setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION")) + setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION")) } } diff --git a/packages/react-native-codegen/android/build.gradle b/packages/react-native-codegen/android/build.gradle index 06b18ac7454..14917613c11 100644 --- a/packages/react-native-codegen/android/build.gradle +++ b/packages/react-native-codegen/android/build.gradle @@ -12,11 +12,6 @@ buildscript { mavenLocal() google() mavenCentral() - jcenter { - content { - includeGroup("org.jetbrains.trove4j") - } - } } dependencies { classpath("com.android.tools.build:gradle:4.2.1") @@ -28,11 +23,6 @@ allprojects { mavenLocal() google() mavenCentral() - jcenter { - content { - includeGroup("org.jetbrains.trove4j") - } - } } } diff --git a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/build.gradle index 9638aa27727..2688b327db9 100644 --- a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle +++ b/packages/react-native-codegen/android/gradlePlugin-build/build.gradle @@ -10,10 +10,5 @@ allprojects { mavenLocal() google() mavenCentral() - jcenter { - content { - includeGroup("org.jetbrains.trove4j") - } - } } } diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts index dedcf4f9eb8..baf3afc39d6 100644 --- a/packages/react-native-gradle-plugin/build.gradle.kts +++ b/packages/react-native-gradle-plugin/build.gradle.kts @@ -13,7 +13,7 @@ plugins { repositories { google() - jcenter() + mavenCentral() } gradlePlugin { diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index 6597a0ecdf0..3d986ef3b94 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -213,6 +213,7 @@ dependencies { hermesDebugImplementation files(hermesPath + "hermes-debug.aar") hermesReleaseImplementation files(hermesPath + "hermes-release.aar") + debugImplementation("com.facebook.fresco:stetho:2.3.0") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } @@ -223,6 +224,7 @@ dependencies { debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' + exclude group:'com.facebook.fresco', module:'stetho' } if (useIntlJsc) { diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 3e76ea0e075..03c69565e96 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -185,6 +185,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + debugImplementation("com.facebook.fresco:stetho:2.3.0") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } @@ -196,6 +197,7 @@ dependencies { debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' + exclude group:'com.facebook.fresco', module:'stetho' } if (enableHermes) { diff --git a/template/android/build.gradle b/template/android/build.gradle index 95d0ed393e0..41f387ac9b4 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -10,7 +10,7 @@ buildscript { } repositories { google() - jcenter() + mavenCentral() } dependencies { classpath("com.android.tools.build:gradle:4.2.1") @@ -21,6 +21,7 @@ buildscript { allprojects { repositories { + mavenCentral() mavenLocal() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm @@ -32,7 +33,6 @@ allprojects { } google() - jcenter() maven { url 'https://www.jitpack.io' } } }