diff --git a/examples/reactnative/rn060example/android/build.gradle b/examples/reactnative/rn060example/android/build.gradle index e7732fe0d7..7fc90d938c 100644 --- 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/app/build.gradle b/examples/reactnative/rn063example/android/app/build.gradle index 544a928c72..35c3a48017 100644 --- a/examples/reactnative/rn063example/android/app/build.gradle +++ b/examples/reactnative/rn063example/android/app/build.gradle @@ -157,6 +157,7 @@ android { signingConfig signingConfigs.debug } release { + debuggable true // Caution! In production, you need to generate your own keystore file. // see https://reactnative.dev/docs/signed-apk-android. signingConfig signingConfigs.debug diff --git a/examples/reactnative/rn063example/android/build.gradle b/examples/reactnative/rn063example/android/build.gradle index ed5a568424..0f42ee9580 100644 --- 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/wrapper/gradle-wrapper.jar b/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2f..7454180f2a 100644 Binary files a/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.jar and b/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.properties b/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.properties index 8422670206..4d9ca16491 100644 --- a/examples/reactnative/rn063example/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/reactnative/rn063example/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/examples/reactnative/rn063example/android/gradlew b/examples/reactnative/rn063example/android/gradlew index 2fe81a7d95..744e882ed5 100755 --- a/examples/reactnative/rn063example/android/gradlew +++ b/examples/reactnative/rn063example/android/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/examples/reactnative/rn063example/android/gradlew.bat b/examples/reactnative/rn063example/android/gradlew.bat index 62bd9b9cce..ac1b06f938 100644 --- a/examples/reactnative/rn063example/android/gradlew.bat +++ b/examples/reactnative/rn063example/android/gradlew.bat @@ -1,103 +1,89 @@ -@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 https://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 -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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 - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 https://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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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 + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega 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 index 9f3c48a6af..257dce9303 100644 --- 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 index ed5a568424..f2032c1c36 100644 --- 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 index a27a18ab00..4687ffd301 100644 --- 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 index ee69dd68d1..4d9ca16491 100644 --- 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 index aec99730b4..15e1ee37a7 100644 --- 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 index e7732fe0d7..7fc90d938c 100644 --- 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/test/react-native-cli/features/fixtures/rn0_60/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native-cli/features/fixtures/rn0_60/android/gradle/wrapper/gradle-wrapper.properties index ee69dd68d1..4d9ca16491 100644 --- a/test/react-native-cli/features/fixtures/rn0_60/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-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 index 28f7ec645b..eefc9a5551 100644 --- 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/test/react-native-cli/features/fixtures/rn0_61/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native-cli/features/fixtures/rn0_61/android/gradle/wrapper/gradle-wrapper.properties index e0c4de36dd..4d9ca16491 100644 --- a/test/react-native-cli/features/fixtures/rn0_61/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-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 index 5d5d188b35..45689590af 100644 --- 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/wrapper/gradle-wrapper.properties b/test/react-native-cli/features/fixtures/rn0_62/android/gradle/wrapper/gradle-wrapper.properties index 1ba7206f88..4d9ca16491 100644 --- a/test/react-native-cli/features/fixtures/rn0_62/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-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 index ed5a568424..0f42ee9580 100644 --- 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/wrapper/gradle-wrapper.jar b/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2f..5c2d1cf016 100644 Binary files a/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.jar and b/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.properties index 8422670206..4d9ca16491 100644 --- a/test/react-native-cli/features/fixtures/rn0_63/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-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 index 4ff87f3b39..9b89da9210 100644 --- 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/wrapper/gradle-wrapper.jar b/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.jar index 2c6137b878..5c2d1cf016 100644 Binary files a/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.jar and b/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.properties index 80cf08e74d..4d9ca16491 100644 --- a/test/react-native-cli/features/fixtures/rn0_63_expo_ejected/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-native-cli/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 index 8e4729af41..9f8e52a15a 100644 --- 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 index c837a92c1b..4d9ca16491 100644 --- 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 diff --git a/test/react-native/features/fixtures/rn0.63/android/build.gradle b/test/react-native/features/fixtures/rn0.63/android/build.gradle index 7b25df8ebf..e3a96a3dc1 100644 --- a/test/react-native/features/fixtures/rn0.63/android/build.gradle +++ b/test/react-native/features/fixtures/rn0.63/android/build.gradle @@ -11,11 +11,12 @@ buildscript { supportLibVersion = "28.0.0" } repositories { + mavenCentral() google() jcenter() } 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:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -33,6 +34,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.63/android/gradle/wrapper/gradle-wrapper.jar b/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2f..5c2d1cf016 100644 Binary files a/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.jar and b/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.properties index 8422670206..4d9ca16491 100644 --- a/test/react-native/features/fixtures/rn0.63/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-native/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/features/fixtures/rn0.64-hermes/android/build.gradle b/test/react-native/features/fixtures/rn0.64-hermes/android/build.gradle index 71ec8cf329..ee2a889ae6 100644 --- a/test/react-native/features/fixtures/rn0.64-hermes/android/build.gradle +++ b/test/react-native/features/fixtures/rn0.64-hermes/android/build.gradle @@ -11,11 +11,12 @@ buildscript { ndkVersion = "20.1.5948944" } repositories { + mavenCentral() google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.1.0") + 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 // in the individual module build.gradle files @@ -36,6 +37,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.64-hermes/android/gradle/wrapper/gradle-wrapper.jar b/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.jar index e708b1c023..5c2d1cf016 100644 Binary files a/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.jar and b/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.properties b/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.properties index 14e30f7416..4d9ca16491 100644 --- a/test/react-native/features/fixtures/rn0.64-hermes/android/gradle/wrapper/gradle-wrapper.properties +++ b/test/react-native/features/fixtures/rn0.64-hermes/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.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists