From edec7a10c3db35918cda4ace48c35d2efbebebdc Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 3 Jun 2020 22:16:58 +0800 Subject: [PATCH 1/3] bump Android Gradle Plugin to 4.0.0 --- .gitignore | 3 ++- ReactAndroid/gradle.properties | 1 - build.gradle.kts | 2 +- template/android/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43810959f7eca0..6db426070894c5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,9 +39,10 @@ buck-out /ReactAndroid/src/main/gen # Android Studio +.build +.classpath .project .settings -.classpath # Watchman .watchmanconfig diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index e3e6285dcce59e..08fd602bce2ced 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -23,4 +23,3 @@ GLOG_VERSION=0.3.5 android.useAndroidX=true android.enableJetifier=true -android.enableR8=false diff --git a/build.gradle.kts b/build.gradle.kts index b96f36ddd4280f..205c23ed1accc3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.3") + classpath("com.android.tools.build:gradle:4.0.0") classpath("de.undercouch:gradle-download-task:4.0.2") // NOTE: Do not place your application dependencies here; they belong diff --git a/template/android/build.gradle b/template/android/build.gradle index ed5a5684245790..3ca1b526b388f4 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.3") + classpath("com.android.tools.build:gradle:4.0.0") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } From bba0da503c04d6e9672fa1e877e442227dc123aa Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 1 Oct 2020 08:58:12 +0800 Subject: [PATCH 2/3] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 205c23ed1accc3..a55cebbc57e9d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.0.0") + classpath("com.android.tools.build:gradle:4.0.1") classpath("de.undercouch:gradle-download-task:4.0.2") // NOTE: Do not place your application dependencies here; they belong From 1f92148a1c0ee0a4b6dd416f911e41542bbf3fb6 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 1 Oct 2020 08:58:26 +0800 Subject: [PATCH 3/3] Update build.gradle --- template/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/android/build.gradle b/template/android/build.gradle index 3ca1b526b388f4..0478bfc233e909 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:4.0.0") + classpath("com.android.tools.build:gradle:4.0.1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }