Gradle 6.9, Android Gradle Plugin 4.2.1 (#31593)

dulmandakh · facebook-github-bot · commit 547b4c92e474 · 2021-06-01T11:29:51.000-07:00
Summary: Bump Gradle to 6.9 which supports Apple Silicon, also Android Gradle Plugin 4.2.1 which defaults to Java 1.8 so no additional config required. ## Changelog [Android] [Changed] - Bump Gradle to 6.9, Android Gradle Plugin to 4.2.1 Pull Request resolved: #31593 Test Plan: rn-tester builds and runs as expected Reviewed By: mdvacca Differential Revision: D28711942 Pulled By: ShikaSD fbshipit-source-id: 2a4616cd0f17db7616ab29dea1652717f2cd0f6d
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
@@ -428,10 +428,6 @@ task extractJNIFiles {
 android {
     compileSdkVersion 30
     ndkVersion ANDROID_NDK_VERSION
-    compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_1_8)
-        targetCompatibility(JavaVersion.VERSION_1_8)
-    }
 
     defaultConfig {
         minSdkVersion(21)
diff --git a/ReactAndroid/src/main/third-party/java/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric/BUCK
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,8 +17,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
-        classpath("de.undercouch:gradle-download-task:4.0.2")
+        classpath("com.android.tools.build:gradle:4.2.1")
+        classpath("de.undercouch:gradle-download-task:4.1.1")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
@@ -5,3 +5,4 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 
 ANDROID_NDK_VERSION=20.1.5948944
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/react-native-codegen/android/build.gradle b/packages/react-native-codegen/android/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
+        classpath("com.android.tools.build:gradle:4.2.1")
     }
 }
 
diff --git a/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-codegen/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.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
@@ -19,7 +19,7 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation 'com.android.tools.build:gradle:4.1.0'
+    implementation 'com.android.tools.build:gradle:4.2.1'
     // Use the same Gson version that `com.android.tools.build:gradle` depends on.
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:29.0-jre'
diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts
@@ -8,7 +8,7 @@
 plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
-  kotlin("jvm") version "1.4.21"
+  kotlin("jvm") version "1.4.20"
 }
 
 repositories {
@@ -26,5 +26,5 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:4.1.0")
+  implementation("com.android.tools.build:gradle:4.2.1")
 }
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
@@ -131,10 +131,7 @@ def useIntlJsc = false
 android {
     compileSdkVersion 29
     ndkVersion ANDROID_NDK_VERSION
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+
     dexOptions {
         javaMaxHeapSize "4g"
     }
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
@@ -125,11 +125,6 @@ android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "com.helloworld"
         minSdkVersion rootProject.ext.minSdkVersion
diff --git a/template/android/build.gradle b/template/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         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
     }
diff --git a/template/android/gradle/wrapper/gradle-wrapper.properties b/template/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.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
@@ -216,8 +216,8 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
         "-XX:+UseConcMarkSweepGC",  # required by -XX:+CMSClassUnloadingEnabled
         "-XX:+CMSClassUnloadingEnabled",
         "-XX:ReservedCodeCacheSize=150M",
-        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4",
-        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4/*.jar",
+        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric",
+        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/*.jar",
         "-Drobolectric.logging.enabled=true",
         "-XX:MaxPermSize=620m",
         "-Drobolectric.offline=true",

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ buildscript {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`dependencies {`
`20`		`- classpath("com.android.tools.build:gradle:4.1.0")`
`21`		`- classpath("de.undercouch:gradle-download-task:4.0.2")`
	`20`	`+ classpath("com.android.tools.build:gradle:4.2.1")`
	`21`	`+ classpath("de.undercouch:gradle-download-task:4.1.1")`
`22`	`22`
`23`	`23`	`// NOTE: Do not place your application dependencies here; they belong`
`24`	`24`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError`
`5`	`5`	`org.gradle.parallel=true`
`6`	`6`
`7`	`7`	`ANDROID_NDK_VERSION=20.1.5948944`
	`8`	`+android.useAndroidX=true`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ buildscript {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- classpath("com.android.tools.build:gradle:4.1.0")`
	`22`	`+ classpath("com.android.tools.build:gradle:4.2.1")`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ gradlePlugin {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- implementation 'com.android.tools.build:gradle:4.1.0'`
	`22`	`+ implementation 'com.android.tools.build:gradle:4.2.1'`
`23`	`23`	// Use the same Gson version that `com.android.tools.build:gradle` depends on.
`24`	`24`	`implementation 'com.google.code.gson:gson:2.8.5'`
`25`	`25`	`implementation 'com.google.guava:guava:29.0-jre'`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`plugins {`
`9`	`9`	`java-gradle-plugin`
`10`	`10`	`kotlin-dsl`
`11`		`- kotlin("jvm") version "1.4.21"`
	`11`	`+ kotlin("jvm") version "1.4.20"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`repositories {`
`@@ -26,5 +26,5 @@ gradlePlugin {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`dependencies {`
`29`		`- implementation("com.android.tools.build:gradle:4.1.0")`
	`29`	`+ implementation("com.android.tools.build:gradle:4.2.1")`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ buildscript {`
`13`	`13`	`jcenter()`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`		`- classpath("com.android.tools.build:gradle:4.1.0")`
	`16`	`+ classpath("com.android.tools.build:gradle:4.2.1")`
`17`	`17`	`// NOTE: Do not place your application dependencies here; they belong`
`18`	`18`	`// in the individual module build.gradle files`
`19`	`19`	`}`