From 415424936dda993687d74e00944af734dd7cba05 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Wed, 26 Feb 2020 14:16:54 +0000
Subject: [PATCH] Multidex debug builds only and bump version

---
 app/build.gradle.kts                                      | 2 +-
 buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt   | 2 +-
 .../src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 08110bb95..d73e8ac93 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,7 @@ apply(from = rootProject.file("jacoco.gradle"))
 ext {
   set("versionMajor", 3)
   set("versionMinor", 2)
-  set("versionPatch", 0)
+  set("versionPatch", 1)
 }
 
 fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 44b649ea7..ab512fec5 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -52,12 +52,12 @@ class AllProjectConfigurer {
         setMinSdkVersion(Config.minSdk)
         setTargetSdkVersion(Config.targetSdk)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled = true
       }
 
       buildTypes {
         getByName("debug") {
           isTestCoverageEnabled = true
+          multiDexEnabled = true
         }
       }
 
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
index 8b7c3548e..da8119dea 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
@@ -17,13 +17,14 @@
  */
 package org.kiwix.kiwixmobile.core;
 
+import android.app.Application;
 import android.content.Context;
 import android.os.Build;
 import android.os.Environment;
 import android.os.StrictMode;
 import android.util.Log;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
+import androidx.multidex.MultiDex;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +34,7 @@ import org.kiwix.kiwixmobile.core.di.components.CoreComponent;
 import org.kiwix.kiwixmobile.core.di.components.DaggerCoreComponent;
 import org.kiwix.kiwixmobile.core.downloader.DownloadMonitor;
 
-public abstract class CoreApp extends MultiDexApplication {
+public abstract class CoreApp extends Application {
 
   private static CoreApp app;
   private static CoreComponent coreComponent;
@@ -64,6 +65,9 @@ public abstract class CoreApp extends MultiDexApplication {
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(base);
+    if (BuildConfig.DEBUG) {
+      MultiDex.install(this);
+    }
     app = this;
     setCoreComponent(DaggerCoreComponent.builder()
       .context(this)