From a10a20105b190e459f53eea6cfaf41320a2c3777 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Wed, 16 Jun 2021 16:37:46 +0100 Subject: [PATCH] Revert "Gradle 6.9, Android Gradle Plugin 4.2.1 (#31593)" This reverts commit 7599593b307b71aebe3184233bd9a5f4478b4c88. --- ReactAndroid/build.gradle | 4 ++++ build.gradle.kts | 4 ++-- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- packages/react-native-codegen/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/gradlePlugin-build/gradlePlugin/build.gradle | 2 +- packages/react-native-gradle-plugin/build.gradle.kts | 4 ++-- packages/rn-tester/android/app/build.gradle | 5 ++++- template/android/app/build.gradle | 5 +++++ template/android/build.gradle | 2 +- template/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 72fbf6bdabf..57b102c367c 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -385,6 +385,10 @@ task installArchives { android { compileSdkVersion 30 ndkVersion ANDROID_NDK_VERSION + compileOptions { + sourceCompatibility(JavaVersion.VERSION_1_8) + targetCompatibility(JavaVersion.VERSION_1_8) + } defaultConfig { minSdkVersion(21) diff --git a/build.gradle.kts b/build.gradle.kts index 47d59f05b27..65422b5f2af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,8 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.2.1") - classpath("de.undercouch:gradle-download-task:4.1.1") + classpath("com.android.tools.build:gradle:4.1.0") + classpath("de.undercouch:gradle-download-task:4.0.2") // 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 index 0edb7925961..dd6698ad75b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,3 @@ 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 index 7665b0fa93a..8cf6eb5ad22 100644 --- 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.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-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 index 14917613c11..878e065fc28 100644 --- a/packages/react-native-codegen/android/build.gradle +++ b/packages/react-native-codegen/android/build.gradle @@ -14,7 +14,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.2.1") + classpath("com.android.tools.build:gradle:4.1.0") } } diff --git a/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties index 7665b0fa93a..14e30f7416a 100644 --- 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.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-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 index 4d91d9968d2..5efb793d69f 100644 --- 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.2.1' + implementation 'com.android.tools.build:gradle:4.1.0' // 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 index baf3afc39d6..919f15e8ec8 100644 --- 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.20" + kotlin("jvm") version "1.4.21" } repositories { @@ -26,5 +26,5 @@ gradlePlugin { } dependencies { - implementation("com.android.tools.build:gradle:4.2.1") + implementation("com.android.tools.build:gradle:4.1.0") } diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index 3d986ef3b94..db402a2325b 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -131,7 +131,10 @@ 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 index 03c69565e96..ffd20c88eed 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -125,6 +125,11 @@ 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 index e64d31e5fb6..34f52b5b11d 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -13,7 +13,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.2.1") + classpath("com.android.tools.build:gradle:4.1.0") // 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 index 7665b0fa93a..8cf6eb5ad22 100644 --- 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.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists