]> gitweb.fperrin.net Git - Dictionary.git/commitdiff
Enable multidex and desugar again.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 6 Jun 2020 14:56:52 +0000 (16:56 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 6 Jun 2020 14:56:52 +0000 (16:56 +0200)
It seems it was not the cause of the issues
and it's simple AndroidStudio being broken.

build.gradle

index 123d856e0ff3516b745f4bb5c082ea7a9e5b64ed..f586b429a095eb3df4295fb6548b5bdb9c033f83 100644 (file)
@@ -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
+    }
 }