Skip to content

bump android gradle plugin to 3.4.0 #24463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dulmandakh wants to merge 4 commits into from
Closed

bump android gradle plugin to 3.4.0 #24463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50d40ee
bump android gradle plugin to 3.4.0
dulmandakh Apr 16, 2019
cd9cf2e
Update build.gradle
dulmandakh Apr 17, 2019
a8f4b81
fix asset bundling
dulmandakh Apr 21, 2019
963f648
disable R8 for ReactAndroid
dulmandakh Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ReactAndroid/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ GLOG_VERSION=0.3.5

android.useAndroidX=true
android.enableJetifier=true
android.enableR8=false
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions react.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion template/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down