Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove jcenter #31609

Closed
wants to merge 5 commits into from
Closed

remove jcenter #31609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e561c83
remove jcenter
dulmandakh May 27, 2021
1e4cd59
jitpack
dulmandakh May 27, 2021
237bc54
fix jitpack repo
dulmandakh May 27, 2021
cb3544c
remove jitpack from buck
dulmandakh Jun 2, 2021
59365c6
Merge branch 'master' into remove-jcenter
dulmandakh Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .buckconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ indent_size = 2
[*.gradle]
indent_size = 4

[*.kts]
indent_size = 4

[BUCK]
indent_size = 4

Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,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")
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
14 changes: 3 additions & 11 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -38,16 +33,13 @@ allprojects {
mavenLocal()
google()
mavenCentral()
jcenter {
content {
includeModule("com.facebook.yoga", "proguard-annotations")
includeModule("com.facebook.fresco", "stetho")
}
maven {
Copy link
Contributor

@ShikaSD ShikaSD Jun 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I believe we also don't need jitpack here
Only FB specific deps are remaining according to the list above, and they should be available on Maven Central

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I can remove it but tomorrow

url = uri("https://jitpack.io")
}
}

// 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"))
}
}
10 changes: 0 additions & 10 deletions packages/react-native-codegen/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ buildscript {
mavenLocal()
google()
mavenCentral()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
Expand All @@ -28,11 +23,6 @@ allprojects {
mavenLocal()
google()
mavenCentral()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
}

Expand Down
5 changes: 0 additions & 5 deletions packages/react-native-codegen/android/gradlePlugin-build/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,5 @@ allprojects {
mavenLocal()
google()
mavenCentral()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
}
2 changes: 1 addition & 1 deletion packages/react-native-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {

repositories {
google()
jcenter()
mavenCentral()
}

gradlePlugin {
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions template/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions template/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
Expand All @@ -21,6 +21,7 @@ buildscript {

allprojects {
repositories {
mavenCentral()
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand All @@ -32,7 +33,6 @@ allprojects {
}

google()
jcenter()
maven { url 'https://www.jitpack.io' }
}
}