build(react-native): Update Gradle and AGP in preparation for droppin…

…g jcenter
bugsnag · Jun 16, 2021 · 6402f24 · 6402f24
1 parent bcef646
commit 6402f24
Show file tree

Hide file tree

Showing 32 changed files with 74 additions and 44 deletions.
diff --git a/examples/reactnative/rn060example/android/build.gradle b/examples/reactnative/rn060example/android/build.gradle
@@ -9,11 +9,12 @@ buildscript {
         supportLibVersion = "28.0.0"
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.1")
+        classpath("com.android.tools.build:gradle:4.2.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,6 +33,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
     }

diff --git a/examples/reactnative/rn063example/android/build.gradle b/examples/reactnative/rn063example/android/build.gradle
@@ -8,11 +8,12 @@ buildscript {
         targetSdkVersion = 29
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.2.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -30,6 +31,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://www.jitpack.io' }

diff --git a/examples/reactnative/rn063example/android/gradle.properties b/examples/reactnative/rn063example/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.75.0
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/root-build-after.gradle b/packages/react-native-cli/src/lib/__test__/fixtures/root-build-after.gradle
@@ -9,10 +9,10 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.2.1")
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,8 +31,8 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
     }
 }
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/root-build-before.gradle b/packages/react-native-cli/src/lib/__test__/fixtures/root-build-before.gradle
@@ -9,10 +9,10 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.2.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -30,8 +30,8 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
     }
 }
diff --git a/packages/react-native/android/build.gradle b/packages/react-native/android/build.gradle
@@ -1,14 +1,14 @@
 buildscript {
     repositories {
-        google()
         mavenCentral()
+        google()
         jcenter()
         maven { // add this to use snapshots
             url "https://oss.sonatype.org/content/repositories/snapshots/"
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
     }
 }
@@ -70,8 +70,9 @@ allprojects {
     repositories {
         maven { url facebookRepo }
         maven { url bugsnagRepo }
-        jcenter()
+        mavenCentral()
         google()
+        jcenter()
     }
 }
 

diff --git a/packages/react-native/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/react-native/android/gradlew.bat b/packages/react-native/android/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

diff --git a/test/react-native-cli/features/fixtures/rn0_60/android/build.gradle b/test/react-native-cli/features/fixtures/rn0_60/android/build.gradle
@@ -9,11 +9,12 @@ buildscript {
         supportLibVersion = "28.0.0"
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.1")
+        classpath("com.android.tools.build:gradle:4.2.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -32,6 +33,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
     }

diff --git a/...eact-native-cli/features/fixtures/rn0_60/android/gradle/wrapper/gradle-wrapper.properties b/...eact-native-cli/features/fixtures/rn0_60/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/react-native-cli/features/fixtures/rn0_61/android/build.gradle b/test/react-native-cli/features/fixtures/rn0_61/android/build.gradle
@@ -8,11 +8,12 @@ buildscript {
         targetSdkVersion = 28
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath("com.android.tools.build:gradle:4.2.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,6 +32,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://jitpack.io' }

diff --git a/...eact-native-cli/features/fixtures/rn0_61/android/gradle/wrapper/gradle-wrapper.properties b/...eact-native-cli/features/fixtures/rn0_61/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/react-native-cli/features/fixtures/rn0_62/android/build.gradle b/test/react-native-cli/features/fixtures/rn0_62/android/build.gradle
@@ -8,11 +8,12 @@ buildscript {
         targetSdkVersion = 28
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.2")
+        classpath("com.android.tools.build:gradle:4.2.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,6 +32,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://www.jitpack.io' }

diff --git a/test/react-native-cli/features/fixtures/rn0_62/android/gradle.properties b/test/react-native-cli/features/fixtures/rn0_62/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.33.1
+FLIPPER_VERSION=0.75.0
diff --git a/...eact-native-cli/features/fixtures/rn0_62/android/gradle/wrapper/gradle-wrapper.properties b/...eact-native-cli/features/fixtures/rn0_62/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/react-native-cli/features/fixtures/rn0_63/android/build.gradle b/test/react-native-cli/features/fixtures/rn0_63/android/build.gradle
@@ -8,11 +8,12 @@ buildscript {
         targetSdkVersion = 29
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:4.2.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -30,6 +31,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://www.jitpack.io' }

diff --git a/test/react-native-cli/features/fixtures/rn0_63/android/gradle.properties b/test/react-native-cli/features/fixtures/rn0_63/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.0
diff --git a/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.jar b/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/...eact-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.properties b/...eact-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/build.gradle b/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/build.gradle
@@ -8,11 +8,12 @@ buildscript {
         targetSdkVersion = 30
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
+        classpath("com.android.tools.build:gradle:4.2.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,6 +32,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://www.jitpack.io' }

diff --git a/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle.properties b/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle.properties
@@ -26,4 +26,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.0
diff --git a/...ative-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.jar b/...ative-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/...li/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.properties b/...li/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/react-native/features/fixtures/rn0.60/android/build.gradle b/test/react-native/features/fixtures/rn0.60/android/build.gradle
@@ -11,11 +11,12 @@ buildscript {
         supportLibVersion = "28.0.0"
     }
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.1")
+        classpath("com.android.tools.build:gradle:4.2.1")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -37,6 +38,7 @@ allprojects {
             url("$rootDir/../node_modules/jsc-android/dist")
         }
 
+        mavenCentral()
         google()
         jcenter()
         maven { url 'https://www.jitpack.io' }

diff --git a/test/react-native/features/fixtures/rn0.60/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native/features/fixtures/rn0.60/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Sep 26 08:53:52 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip