From e422993c2ed266547d850c3ffd781dd2aa79ddce Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 24 Jul 2021 11:54:53 -0400
Subject: [PATCH] Remove unnecessary MultiDex library

(cherry picked from commit f2fca0f13d67ca1800b59ca807280316d700d55d)

# Conflicts:
#	app/build.gradle.kts
---
 app/build.gradle.kts                         | 4 ----
 app/src/main/java/eu/kanade/tachiyomi/App.kt | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 248d5e131..93ad85a4b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -41,8 +41,6 @@ android {
         buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
         buildConfigField("boolean", "INCLUDE_UPDATER", "false")
 
-        multiDexEnabled = true
-
         ndk {
             abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86")
         }
@@ -139,7 +137,6 @@ dependencies {
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
     implementation("androidx.core:core-ktx:1.7.0-alpha01")
     implementation("androidx.core:core-splashscreen:1.0.0-alpha01")
-    implementation("androidx.multidex:multidex:2.0.1")
     implementation("androidx.preference:preference-ktx:1.1.1")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
@@ -260,7 +257,6 @@ dependencies {
 
     val robolectricVersion = "3.1.4"
     testImplementation("org.robolectric:robolectric:$robolectricVersion")
-    testImplementation("org.robolectric:shadows-multidex:$robolectricVersion")
     testImplementation("org.robolectric:shadows-play-services:$robolectricVersion")
 
     // For detecting memory leaks; see https://square.github.io/leakcanary/
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index abfbda72b..cb91c9d22 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -19,7 +19,6 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import androidx.multidex.MultiDex
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.GifDecoder
@@ -143,11 +142,6 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
             }.launchIn(ProcessLifecycleOwner.get().lifecycleScope)
     }
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
-
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this).apply {
             componentRegistry {