diff --git a/app/build.gradle b/app/build.gradle index 7f6360f8..05341f6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,7 +75,6 @@ android { versionName formattedVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary true - multiDexEnabled true project.logger.lifecycle("VersionName: $versionName") project.logger.lifecycle("VersionCode: $versionCode") @@ -200,7 +199,6 @@ def lifecycleExtensionVersion = '2.2.0' def lifecycleVersion = '2.7.0' def appCompatVersion = '1.6.1' def androidAnnotationVersion = '1.7.0' -def multidexVersion = '2.0.1' def coroutinesVersion = '1.7.3' def recyclerViewVersion = '1.3.2' def materialVersion = '1.9.0' @@ -244,7 +242,6 @@ dependencies { testImplementation "androidx.arch.core:core-testing:$androidXArchVersion" testImplementation "androidx.test:core:$androidXCoreVersion" testImplementation "org.robolectric:robolectric:$robolectricVersion" - testImplementation "org.robolectric:shadows-multidex:$robolectricVersion" // Android test dependencies androidTestImplementation "androidx.test.ext:junit:$androidXJunitVersion" @@ -253,9 +250,6 @@ dependencies { androidTestImplementation "com.google.truth:truth:$truthVersion" androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" - // MultiDex - implementation "androidx.multidex:multidex:$multidexVersion" - // DI implementation "io.insert-koin:koin-android:$koinVersion" implementation "io.insert-koin:koin-core:$koinVersion" diff --git a/app/src/main/kotlin/com/ivanovsky/passnotes/App.kt b/app/src/main/kotlin/com/ivanovsky/passnotes/App.kt index b56bc526..14a0acb9 100644 --- a/app/src/main/kotlin/com/ivanovsky/passnotes/App.kt +++ b/app/src/main/kotlin/com/ivanovsky/passnotes/App.kt @@ -1,7 +1,7 @@ package com.ivanovsky.passnotes +import android.app.Application import android.content.Context -import androidx.multidex.MultiDexApplication import com.ivanovsky.passnotes.data.repository.settings.Settings import com.ivanovsky.passnotes.data.repository.settings.SettingsImpl import com.ivanovsky.passnotes.domain.LoggerInteractor @@ -11,7 +11,7 @@ import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger import org.koin.core.context.startKoin -open class App : MultiDexApplication() { +open class App : Application() { open fun configureModuleBuilder(builder: DIModuleBuilder) { // implementation should be flavor specific