Merge pull request #20 from MGaetan89/remove_multidex

Remove Multidex declaration
shalzz · Nov 12, 2024 · 0b70c53 · 0b70c53
2 parents a969f5e + 9d48406
commit 0b70c53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -59,7 +59,6 @@ android {
         targetSdk = 34
         versionCode = gitCommitCount
         versionName = gitTag
-        multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         ndkVersion = "22.1.7171670"
         resourceConfigurations += setOf("en")
@@ -198,9 +197,6 @@ dependencies {
     val NAV_VERSION = "2.7.1"
     val BILLING_VERSION = "6.0.1"
 
-    // TODO: re-evaluate when RxJava is completely replaced with kotlin co-routines
-    implementation("androidx.multidex:multidex:2.0.1")
-
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
@@ -287,7 +283,6 @@ dependencies {
     testImplementation(mockito)
     testImplementation("androidx.test:core:1.5.0")
     testImplementation("org.robolectric:robolectric:4.10.3")
-    testImplementation("org.robolectric:shadows-multidex:4.10.3")
 
     // Instrumentation test dependencies
     androidTestImplementation(jUnit)

diff --git a/app/src/main/java/com/shalzz/attendance/MyApplication.java b/app/src/main/java/com/shalzz/attendance/MyApplication.java
@@ -19,6 +19,7 @@
 
 package com.shalzz.attendance;
 
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -34,11 +35,10 @@
 import java.util.HashSet;
 
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 import timber.log.Timber;
 
-public class MyApplication extends MultiDexApplication {
+public class MyApplication extends Application {
 
     private static ApplicationComponent mApplicationComponent;