From f81b27be28f01b56aba0d04ba7bc83fea6fa7461 Mon Sep 17 00:00:00 2001 From: Andreas Wuerl Date: Sat, 20 Jun 2020 09:11:33 +0200 Subject: [PATCH] disable obsolete multidex --- app/build.gradle | 6 ++---- .../main/java/org/blitzortung/android/app/BOApplication.kt | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 34a4764d..c165a960 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { minSdkVersion 15 targetSdkVersion 29 versionCode 270 - versionName '2.1.0' - multiDexEnabled true + versionName '2.1.1' + multiDexEnabled false testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -71,8 +71,6 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation "androidx.work:work-runtime-ktx:2.3.4" implementation 'org.osmdroid:osmdroid-android:6.1.6' - implementation 'com.android.support:multidex:1.0.3' - implementation 'androidx.multidex:multidex:2.0.1' // Dagger2 implementation "com.google.dagger:dagger:$dagger_version" diff --git a/app/src/main/java/org/blitzortung/android/app/BOApplication.kt b/app/src/main/java/org/blitzortung/android/app/BOApplication.kt index 3f016c4a..5c0fd6be 100644 --- a/app/src/main/java/org/blitzortung/android/app/BOApplication.kt +++ b/app/src/main/java/org/blitzortung/android/app/BOApplication.kt @@ -1,6 +1,6 @@ package org.blitzortung.android.app -import androidx.multidex.MultiDexApplication +import android.app.Application import dagger.android.AndroidInjector import dagger.android.DispatchingAndroidInjector import dagger.android.HasAndroidInjector @@ -9,7 +9,7 @@ import org.blitzortung.android.dagger.module.AppModule import org.blitzortung.android.dagger.module.ServiceModule import javax.inject.Inject -class BOApplication : MultiDexApplication(), HasAndroidInjector { +class BOApplication : Application(), HasAndroidInjector { @set:Inject lateinit var androidInjector: DispatchingAndroidInjector