diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 00b3dcb0d..c35f4245d 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 diff --git a/build.gradle b/build.gradle index 9198857c2..85dec6e68 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/react.gradle b/react.gradle index 142a21c8a..11b3465e5 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 diff --git a/template/android/build.gradle b/template/android/build.gradle index 6b738db44..99f410470 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