Enable R8 desugaring also for debug builds

This commit is contained in:
Ricki Hirner 2020-05-30 13:52:02 +02:00
parent 24c583b784
commit 822720e597
3 changed files with 9 additions and 9 deletions

View file

@ -28,6 +28,8 @@ android {
targetSdkVersion 29 // Android 10.0
buildConfigField "String", "userAgent", "\"DAVx5\""
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
@ -52,11 +54,13 @@ android {
buildTypes {
debug {
minifyEnabled false
// minifyEnabled enables R8 and thus desugaring (which is needed for working debug builds)
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'
}
}
@ -73,10 +77,6 @@ android {
exclude 'META-INF/LICENSE'
}
defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
dokka.configuration {
sourceLink {
url = "https://gitlab.com/bitfireAT/davx5-ose/tree/master-ose/"
@ -122,7 +122,7 @@ dependencies {
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
implementation 'com.google.android:flexbox:1.1.0'
implementation 'com.google.android.material:material:1.2.0-alpha06'
implementation 'com.google.android.material:material:1.2.0-beta01'
def room_version = '2.2.5'
implementation "androidx.room:room-runtime:$room_version"

View file

@ -2,4 +2,4 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx4g
android.useAndroidX=true
android.databinding.incremental=true
android.databinding.incremental=true

@ -1 +1 @@
Subproject commit f5c0a4fa545f677fbc9f544a733b9f3b02d6b8fe
Subproject commit a675c7194bd473326429023b960a784bf3c43f72