From 50d40eef652b7f5d8a28b47aad57e56e278ed351 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 16 Apr 2019 10:37:24 +0800 Subject: [PATCH 1/4] bump android gradle plugin to 3.4.0 --- build.gradle | 2 +- template/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9198857c2b19ae..85dec6e68527b5 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.3.2") + classpath("com.android.tools.build:gradle:3.4.0") classpath("de.undercouch:gradle-download-task:3.4.3") // NOTE: Do not place your application dependencies here; they belong diff --git a/template/android/build.gradle b/template/android/build.gradle index 6b738db44078c0..741cf04de0d291 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From cd9cf2e57bd2268324d208c90988955842a0bf06 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 18 Apr 2019 07:53:27 +0800 Subject: [PATCH 2/4] 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 741cf04de0d291..99f4104700f2f1 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath("com.android.tools.build:gradle:3.4.0") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From a8f4b81078654f71a35fcc2a20b2279a6594752d Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sun, 21 Apr 2019 09:09:52 +0800 Subject: [PATCH 3/4] fix asset bundling --- react.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/react.gradle b/react.gradle index 142a21c8a2db50..11b3465e51bdd9 100644 --- a/react.gradle +++ b/react.gradle @@ -148,6 +148,11 @@ afterEvaluate { into ("merged_assets/${variant.name}/merge${targetName}Assets/out") { from(jsBundleDir) } + + // Workaround for Android Gradle Plugin 3.4+ new asset directory + into ("merged_assets/${variant.name}/out") { + from(jsBundleDir) + } } // mergeAssets must run first, as it clears the intermediates directory From 963f648e7de21dfbade2577a34715b2fe7caee0e Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 23 Apr 2019 14:36:11 +0800 Subject: [PATCH 4/4] disable R8 for ReactAndroid --- ReactAndroid/gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 00b3dcb0d10ff8..c35f4245d3324f 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -23,3 +23,4 @@ GLOG_VERSION=0.3.5 android.useAndroidX=true android.enableJetifier=true +android.enableR8=false \ No newline at end of file