Skip to content

Commit

Permalink
fix(all, android): purge jcenter() from android build
Browse files Browse the repository at this point in the history
Only remaining jcenter usage is in our tests app, not used by
library consumers, where we must retain it until react-native itself
is jcenter-free
  • Loading branch information
mikehardy committed Apr 19, 2021
1 parent ca68518 commit 2c6a6a8
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 40 deletions.
4 changes: 2 additions & 2 deletions packages/admob/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -101,7 +101,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -97,7 +97,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -73,7 +73,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -78,7 +78,7 @@ android {

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

def safeExtGet(prop, fallback) {
Expand Down
4 changes: 2 additions & 2 deletions packages/crashlytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -79,7 +79,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/database/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/dynamic-links/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -79,7 +79,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/firestore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/functions/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/iid/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -86,7 +86,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/in-app-messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -100,7 +100,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/ml/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/perf/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -97,7 +97,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/remote-config/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -84,7 +84,7 @@ android {

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

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions packages/storage/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -79,7 +79,7 @@ android {

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

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions scripts/_TEMPLATE_/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

Expand All @@ -25,7 +25,7 @@ project.ext {
],

firebase : [
bom: "26.0.0"
bom: "26.8.0"
],
],
])
Expand All @@ -47,7 +47,7 @@ android {

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

dependencies {
Expand Down
7 changes: 3 additions & 4 deletions tests/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
ext.targetSdkVersion = 30
ext.ndkVersion = "20.1.5948944"

ext.kotlinVersion = '1.4.31' // https://kotlinlang.org/releases.html
ext.kotlinVersion = '1.4.32' // https://kotlinlang.org/releases.html
ext.supportLibVersion = "1.3.2" // this maps to androidx.core https://developer.android.com/jetpack/androidx/releases/core
ext.appCompatVersion = "1.2.0" // this maps to androidx.appcompat https://developer.android.com/jetpack/androidx/releases/appcompat
ext.supportVersion = ext.supportLibVersion
Expand All @@ -25,7 +25,6 @@ buildscript {

repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
Expand Down Expand Up @@ -55,9 +54,9 @@ allprojects {
// // Detox as an .aar file (we're going to use it as a compile dependency though, to patch it)
// url "$rootDir/../node_modules/detox/Detox-android"
// }
jcenter()
mavenCentral()
jcenter() // com.facebook.yoa:proguard-annotations not published elsewhere yet, and react-native needs new flipper+fbjni-java-only
}

}

subprojects {
Expand Down

1 comment on commit 2c6a6a8

@vercel
Copy link

@vercel vercel bot commented on 2c6a6a8 Apr 19, 2021

Choose a reason for hiding this comment

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

Please sign in to comment.