Merge pull request #719 from tarun0/multidex

Enabled multidex and updated Support Library version
openMF · Jul 14, 2017 · 14b9a20 · 14b9a20
2 parents fc03449 + 7207482
commit 14b9a20
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/mifosng-android/build.gradle b/mifosng-android/build.gradle
@@ -210,23 +210,23 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.10.19'
 
 }
-    /*
-    Resolves dependency versions across test and production APKs, specifically, transitive
-    dependencies. This is required since Espresso internally has a dependency on support-annotations.
-    */
-    configurations.all {
-        resolutionStrategy.force "com.android.support:support-annotations:23.1.1"
-    }
+/*
+Resolves dependency versions across test and production APKs, specifically, transitive
+dependencies. This is required since Espresso internally has a dependency on support-annotations.
+*/
+configurations.all {
+    resolutionStrategy.force "com.android.support:support-annotations:23.1.1"
+}
 
-    /*
-    All direct/transitive dependencies shared between your test and production APKs need to be
-    excluded from the test APK! This is necessary because both APKs will contain the same classes. Not
-    excluding these dependencies from your test configuration will result in an dex pre-verifier error
-    at runtime. More info in this tools bug: (https://code.google.com/p/android/issues/detail?id=192497)
-    */
-    configurations.compile.dependencies.each { compileDependency ->
-        println "Excluding compile dependency: ${compileDependency.getName()}"
-        configurations.androidTestCompile.dependencies.each { androidTestCompileDependency ->
-            configurations.androidTestCompile.exclude module: "${compileDependency.getName()}"
-        }
+/*
+All direct/transitive dependencies shared between your test and production APKs need to be
+excluded from the test APK! This is necessary because both APKs will contain the same classes. Not
+excluding these dependencies from your test configuration will result in an dex pre-verifier error
+at runtime. More info in this tools bug: (https://code.google.com/p/android/issues/detail?id=192497)
+*/
+configurations.compile.dependencies.each { compileDependency ->
+    println "Excluding compile dependency: ${compileDependency.getName()}"
+    configurations.androidTestCompile.dependencies.each { androidTestCompileDependency ->
+        configurations.androidTestCompile.exclude module: "${compileDependency.getName()}"
     }
+}
diff --git a/mifosng-android/src/main/java/com/mifos/App.java b/mifosng-android/src/main/java/com/mifos/App.java
@@ -5,9 +5,9 @@
 
 package com.mifos;
 
-import android.app.Application;
 import android.content.Context;
 import android.graphics.Typeface;
+import android.support.multidex.MultiDexApplication;
 
 import com.crashlytics.android.Crashlytics;
 import com.facebook.stetho.Stetho;
@@ -27,7 +27,7 @@
 /**
  * Created by ishankhanna on 13/03/15.
  */
-public class App extends Application {
+public class App extends MultiDexApplication {
 
     public static final Map<Integer, Typeface> typefaceManager = new HashMap<>();