Cleaned up dependencies.gradle

Moved MultiDex to debug only

dependencies.gradle

@@ -11,6 +11,9 @@ ext.versions = [
         jacoco               : "0.8.2",
 
         androidSupport       : "22.2.1",
+        androidLegacySupport : "1.0.0",
+        androidSupportDesign : "1.0.0",
+        multidex             : "2.0.1",
 
         kotlin               : "1.3.72",
 
@@ -30,6 +33,7 @@ ext.versions = [
         apacheCodecs         : "1.10",
         testRunner           : "1.0.1",
         robolectric          : "3.8",
+        dexter               : "6.1.2",
 ]
 
 ext.gradlePlugins = [
@@ -41,9 +45,10 @@ ext.gradlePlugins = [
 ]
 
 ext.androidSupport = [
-        support    : 'androidx.legacy:legacy-support-v4:1.0.0',
+        support    : "androidx.legacy:legacy-support-v4:$versions.androidLegacySupport",
-        design     : 'com.google.android.material:material:1.0.0',
+        design     : "com.google.android.material:material:$versions.androidSupportDesign",
-        annotations: "com.android.support:support-annotations:$versions.androidSupport"
+        annotations: "com.android.support:support-annotations:$versions.androidSupport",
+        multidex   : "androidx.multidex:multidex:$versions.multidex",
 ]
 
 ext.other = [
@@ -60,6 +65,7 @@ ext.other = [
         koinJava           : "org.koin:koin-java:$versions.koin",
         koinAndroid        : "org.koin:koin-android:$versions.koin",
         picasso            : "com.squareup.picasso:picasso:$versions.picasso",
+        dexter             : "com.karumi:dexter:$versions.dexter",
 ]
 
 ext.testing = [

ultrasonic/build.gradle

@@ -13,7 +13,6 @@ android {
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        multiDexEnabled true
 
         resConfigs "de", "en", "es", "fr", "hu", "nl", "pl", "pt", "pt-rBR"
     }
@@ -31,6 +30,7 @@ android {
         }
         debug {
             minifyEnabled false
+            multiDexEnabled true
             testCoverageEnabled true
             applicationIdSuffix ".debug"
         }
@@ -55,9 +55,6 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    def multidex_version = "2.0.1"
-    implementation "androidx.multidex:multidex:$multidex_version"
-
     implementation project(':core:menudrawer')
     implementation project(':core:pulltorefresh')
     implementation project(':core:library')
@@ -68,6 +65,7 @@ dependencies {
 
     implementation androidSupport.support
     implementation androidSupport.design
+    implementation androidSupport.multidex
 
     implementation other.kotlinStdlib
     implementation other.koinAndroid
@@ -79,7 +77,7 @@ dependencies {
     testImplementation testing.kotlinJunit
     testImplementation testing.mockitoKotlin
     testImplementation testing.kluent
-    implementation 'com.karumi:dexter:6.1.2'
+    implementation other.dexter
 }
 
 jacoco {

ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt

@@ -1,6 +1,5 @@
 package org.moire.ultrasonic.app
 
-import android.app.Application
 import androidx.multidex.MultiDexApplication
 import org.koin.android.ext.android.startKoin
 import org.moire.ultrasonic.di.DiProperties