From ebaed3801560ba0816da039ebb98219f7638b24f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Sat, 6 Jun 2020 16:56:52 +0200 Subject: [PATCH] Enable multidex and desugar again. It seems it was not the cause of the issues and it's simple AndroidStudio being broken. --- build.gradle | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 123d856..f586b42 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ dependencies { builtBy 'makesmallicu' } implementation 'com.android.support:preference-v7:25.3.1' -// coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5' } task makesmallicu (type:Exec, dependsOn: configurations.smallicu) { @@ -82,15 +82,14 @@ android { } defaultConfig { applicationId 'de.reimardoeffinger.quickdic' - // disabled since it breaks AndroidStudio, claims "default activity not found" -// multiDexEnabled true + multiDexEnabled true targetSdkVersion 29 resConfigs "de", "es", "eu", "fr", "it", "ja", "pt", "pt-rBR", "ru", "zh-rCN" minSdkVersion 10 } -// compileOptions { -// coreLibraryDesugaringEnabled true -// sourceCompatibility JavaVersion.VERSION_1_8 -// targetCompatibility JavaVersion.VERSION_1_8 -// } + compileOptions { + coreLibraryDesugaringEnabled true + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } -- 2.43.0