From ce47d4f64e98672f80b3456375652908515847fe Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sun, 18 Apr 2021 23:43:03 -0500 Subject: [PATCH] fix(all, android): purge jcenter() from android build 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 --- packages/admob/android/build.gradle | 4 ++-- packages/analytics/android/build.gradle | 4 ++-- packages/app/android/build.gradle | 4 ++-- packages/auth/android/build.gradle | 4 ++-- packages/crashlytics/android/build.gradle | 4 ++-- packages/database/android/build.gradle | 4 ++-- packages/dynamic-links/android/build.gradle | 4 ++-- packages/firestore/android/build.gradle | 4 ++-- packages/functions/android/build.gradle | 4 ++-- packages/iid/android/build.gradle | 4 ++-- packages/in-app-messaging/android/build.gradle | 4 ++-- packages/messaging/android/build.gradle | 4 ++-- packages/ml/android/build.gradle | 4 ++-- packages/perf/android/build.gradle | 4 ++-- packages/remote-config/android/build.gradle | 4 ++-- packages/storage/android/build.gradle | 4 ++-- scripts/_TEMPLATE_/android/build.gradle | 8 ++++---- tests/android/build.gradle | 7 +++---- 18 files changed, 39 insertions(+), 40 deletions(-) diff --git a/packages/admob/android/build.gradle b/packages/admob/android/build.gradle index c8d2e73a35..b85d286b9d 100644 --- a/packages/admob/android/build.gradle +++ b/packages/admob/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -101,7 +101,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle index 921b30c5e7..b1a0a1736d 100644 --- a/packages/analytics/android/build.gradle +++ b/packages/analytics/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -97,7 +97,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle index 6289b088c8..8f0197e537 100644 --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -73,7 +73,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle index 86bcb58663..d513184121 100644 --- a/packages/auth/android/build.gradle +++ b/packages/auth/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -78,7 +78,7 @@ android { repositories { google() - jcenter() + mavenCentral() } def safeExtGet(prop, fallback) { diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle index d6f3692cda..a6556d4edf 100644 --- a/packages/crashlytics/android/build.gradle +++ b/packages/crashlytics/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -79,7 +79,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/database/android/build.gradle b/packages/database/android/build.gradle index e3a58d15c2..b85a8b56f5 100644 --- a/packages/database/android/build.gradle +++ b/packages/database/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/dynamic-links/android/build.gradle b/packages/dynamic-links/android/build.gradle index e1b0ccacce..98a0fbfe48 100644 --- a/packages/dynamic-links/android/build.gradle +++ b/packages/dynamic-links/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -79,7 +79,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/firestore/android/build.gradle b/packages/firestore/android/build.gradle index 7dacf6c556..11a79459d1 100644 --- a/packages/firestore/android/build.gradle +++ b/packages/firestore/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle index fde332761f..4e83837a8e 100644 --- a/packages/functions/android/build.gradle +++ b/packages/functions/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/iid/android/build.gradle b/packages/iid/android/build.gradle index 1a62b62e48..aca3029b8f 100644 --- a/packages/iid/android/build.gradle +++ b/packages/iid/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -86,7 +86,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/in-app-messaging/android/build.gradle b/packages/in-app-messaging/android/build.gradle index d651867e3e..fc9b44e2cb 100644 --- a/packages/in-app-messaging/android/build.gradle +++ b/packages/in-app-messaging/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle index b4aec1af29..49aa571f55 100644 --- a/packages/messaging/android/build.gradle +++ b/packages/messaging/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -100,7 +100,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/ml/android/build.gradle b/packages/ml/android/build.gradle index 157612feea..0516b3dc78 100644 --- a/packages/ml/android/build.gradle +++ b/packages/ml/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle index 92a56e7164..ba8836c7b7 100644 --- a/packages/perf/android/build.gradle +++ b/packages/perf/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -97,7 +97,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/remote-config/android/build.gradle b/packages/remote-config/android/build.gradle index 43e193f977..9feddcf966 100644 --- a/packages/remote-config/android/build.gradle +++ b/packages/remote-config/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -84,7 +84,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/packages/storage/android/build.gradle b/packages/storage/android/build.gradle index d711c18871..645c4da885 100644 --- a/packages/storage/android/build.gradle +++ b/packages/storage/android/build.gradle @@ -7,7 +7,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -79,7 +79,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/scripts/_TEMPLATE_/android/build.gradle b/scripts/_TEMPLATE_/android/build.gradle index cfcfe702b9..4a46d8c6d4 100644 --- a/scripts/_TEMPLATE_/android/build.gradle +++ b/scripts/_TEMPLATE_/android/build.gradle @@ -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' } } @@ -25,7 +25,7 @@ project.ext { ], firebase : [ - bom: "26.0.0" + bom: "26.8.0" ], ], ]) @@ -47,7 +47,7 @@ android { repositories { google() - jcenter() + mavenCentral() } dependencies { diff --git a/tests/android/build.gradle b/tests/android/build.gradle index e8d1910f50..760d16ca90 100644 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -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 @@ -25,7 +25,6 @@ buildscript { repositories { google() - jcenter() mavenCentral() } dependencies { @@ -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 {