Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Multidex usages #277

Merged
merged 1 commit into from
Oct 12, 2024
Merged

Remove Multidex usages #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/ivanovsky/passnotes/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Loading