Skip to content

Commit 70da640

Browse files
dulmandakhfacebook-github-bot
authored andcommitted
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: #31609 Test Plan: rn-tester builds and runs as expected. Reviewed By: mdvacca Differential Revision: D28802444 Pulled By: ShikaSD fbshipit-source-id: 043ef079d0cda77a1f8dd732678452ed712741a4
1 parent 249435c commit 70da640

File tree

11 files changed

+14
-34
lines changed

11 files changed

+14
-34
lines changed

.buckconfig

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
[maven_repositories]
99
central = https://repo1.maven.org/maven2
1010
google = https://maven.google.com/
11-
jcenter = https://jcenter.bintray.com/
1211

1312
[alias]
1413
rntester = //packages/rn-tester/android/app:app

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ indent_size = 2
1313
[*.gradle]
1414
indent_size = 4
1515

16+
[*.kts]
17+
indent_size = 4
18+
1619
[BUCK]
1720
indent_size = 4
1821

ReactAndroid/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ android {
484484

485485
dependencies {
486486
api("com.facebook.infer.annotation:infer-annotation:0.11.2")
487-
api("com.facebook.yoga:proguard-annotations:1.17.0")
487+
api("com.facebook.yoga:proguard-annotations:1.19.0")
488488
api("javax.inject:javax.inject:1")
489489
api("androidx.appcompat:appcompat:1.0.2")
490490
api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")

ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ rn_prebuilt_jar(
99

1010
fb_native.remote_file(
1111
name = "annotations-binary.jar",
12-
sha1 = "95ff77fd4870136a0454dd7ccad8813db87bd9ab",
13-
url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.17.0/proguard-annotations-1.17.0.jar",
12+
sha1 = "fcbbb39052e6490eaaf6a6959c49c3a4fbe87c63",
13+
url = "mvn:com.facebook.yoga:proguard-annotations:jar:1.19.0",
1414
)
1515

1616
rn_android_library(

build.gradle.kts

+1-12
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ buildscript {
1010
mavenLocal()
1111
google()
1212
mavenCentral()
13-
jcenter {
14-
content {
15-
includeModule("org.jetbrains.trove4j", "trove4j")
16-
}
17-
}
1813
}
1914
dependencies {
2015
classpath("com.android.tools.build:gradle:4.2.1")
@@ -38,16 +33,10 @@ allprojects {
3833
mavenLocal()
3934
google()
4035
mavenCentral()
41-
jcenter {
42-
content {
43-
includeModule("com.facebook.yoga", "proguard-annotations")
44-
includeModule("com.facebook.fresco", "stetho")
45-
}
46-
}
4736
}
4837

4938
// used to override ndk path on CI
5039
if (System.getenv("LOCAL_ANDROID_NDK_VERSION") != null) {
51-
setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION"))
40+
setProperty("ANDROID_NDK_VERSION", System.getenv("LOCAL_ANDROID_NDK_VERSION"))
5241
}
5342
}

packages/react-native-codegen/android/build.gradle

-10
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ buildscript {
1212
mavenLocal()
1313
google()
1414
mavenCentral()
15-
jcenter {
16-
content {
17-
includeGroup("org.jetbrains.trove4j")
18-
}
19-
}
2015
}
2116
dependencies {
2217
classpath("com.android.tools.build:gradle:4.2.1")
@@ -28,11 +23,6 @@ allprojects {
2823
mavenLocal()
2924
google()
3025
mavenCentral()
31-
jcenter {
32-
content {
33-
includeGroup("org.jetbrains.trove4j")
34-
}
35-
}
3626
}
3727
}
3828

packages/react-native-codegen/android/gradlePlugin-build/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,5 @@ allprojects {
1010
mavenLocal()
1111
google()
1212
mavenCentral()
13-
jcenter {
14-
content {
15-
includeGroup("org.jetbrains.trove4j")
16-
}
17-
}
1813
}
1914
}

packages/react-native-gradle-plugin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313

1414
repositories {
1515
google()
16-
jcenter()
16+
mavenCentral()
1717
}
1818

1919
gradlePlugin {

packages/rn-tester/android/app/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ dependencies {
213213
hermesDebugImplementation files(hermesPath + "hermes-debug.aar")
214214
hermesReleaseImplementation files(hermesPath + "hermes-release.aar")
215215

216+
debugImplementation("com.facebook.fresco:stetho:2.3.0")
216217
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
217218
exclude group:'com.facebook.fbjni'
218219
}
@@ -223,6 +224,7 @@ dependencies {
223224

224225
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
225226
exclude group:'com.facebook.flipper'
227+
exclude group:'com.facebook.fresco', module:'stetho'
226228
}
227229

228230
if (useIntlJsc) {

template/android/app/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ dependencies {
185185

186186
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
187187

188+
debugImplementation("com.facebook.fresco:stetho:2.3.0")
188189
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
189190
exclude group:'com.facebook.fbjni'
190191
}
@@ -196,6 +197,7 @@ dependencies {
196197

197198
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
198199
exclude group:'com.facebook.flipper'
200+
exclude group:'com.facebook.fresco', module:'stetho'
199201
}
200202

201203
if (enableHermes) {

template/android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
repositories {
1212
google()
13-
jcenter()
13+
mavenCentral()
1414
}
1515
dependencies {
1616
classpath("com.android.tools.build:gradle:4.2.1")
@@ -21,6 +21,7 @@ buildscript {
2121

2222
allprojects {
2323
repositories {
24+
mavenCentral()
2425
mavenLocal()
2526
maven {
2627
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -32,7 +33,6 @@ allprojects {
3233
}
3334

3435
google()
35-
jcenter()
3636
maven { url 'https://www.jitpack.io' }
3737
}
3838
}

0 commit comments

Comments
 (0)