diff --git a/.buckconfig b/.buckconfig index 3d98e74d71e06a..07ec813646f170 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 2e8c85b97387b5..355a800148a2d9 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 1e7822b7d3bb98..816cb30135bfb2 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -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") diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK index 660cbc636682fc..bae5e4f25e3c20 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 42b4d82d932feb..47d59f05b27108 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 06b18ac7454d7e..14917613c11de9 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 9638aa27727915..2688b327db9dd8 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 dedcf4f9eb880e..baf3afc39d6442 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 6597a0ecdf0f4b..3d986ef3b94694 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 3e76ea0e075e8b..03c69565e96a06 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 95d0ed393e086a..41f387ac9b4f28 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' } } }