diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 80fecfbd7da..f99a8aa64df 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -21,3 +21,5 @@ DOUBLE_CONVERSION_VERSION=1.1.6 FOLLY_VERSION=2018.10.22.00 GLOG_VERSION=0.3.5 JSC_VERSION=236355.1.1 + +android.enableR8=false diff --git a/build.gradle b/build.gradle index 080a3bb288f..57e76847d27 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.3.0") + 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/react.gradle b/react.gradle index 4ead2b6b5d1..f10a00bc9e1 100644 --- a/react.gradle +++ b/react.gradle @@ -146,6 +146,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 diff --git a/template/android/build.gradle b/template/android/build.gradle index d3890937609..3a1d305e5ba 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.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