summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarunBarad <barad.varun29@gmail.com>2016-12-08 19:37:02 +0530
committerVarunBarad <barad.varun29@gmail.com>2016-12-08 19:37:02 +0530
commit234caf3cd59cfec2af0edf6101aafa4b68f6d7de (patch)
treed58c1b53660a0e3bacde7a8fcee5a142ee69a633
parent9406108c61e42b6ad8942e5cce0c87c01c061473 (diff)
downloadAntennaPod-234caf3cd59cfec2af0edf6101aafa4b68f6d7de.zip
Revert to remove MultiDex support.
This reverts commit 9406108c61e42b6ad8942e5cce0c87c01c061473, reversing changes made to b4233f004c5df3fcaae08b0b88e4c0bd8ae3a747.
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/PodcastApp.java4
-rw-r--r--build.gradle1
3 files changed, 2 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index b2ddb0101..d15427aef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,6 @@ android {
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- multiDexEnabled true
versionCode getMyVersionCode()
versionName "${getMyVersionName()}"
testApplicationId "de.test.antennapod"
@@ -127,7 +126,6 @@ dependencies {
} else {
System.out.println("app: free build hack, skipping some dependencies")
}
- compile "com.android.support:multidex:$multiDexVersion"
compile "com.android.support:support-v4:$supportVersion"
compile "com.android.support:appcompat-v7:$supportVersion"
compile "com.android.support:design:$supportVersion"
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 25af9bce3..f6a8db5fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -1,8 +1,8 @@
package de.danoeh.antennapod;
+import android.app.Application;
import android.os.Build;
import android.os.StrictMode;
-import android.support.multidex.MultiDexApplication;
import com.joanzapata.iconify.Iconify;
import com.joanzapata.iconify.fonts.FontAwesomeModule;
@@ -13,7 +13,7 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
import de.danoeh.antennapod.spa.SPAUtil;
/** Main application class. */
-public class PodcastApp extends MultiDexApplication {
+public class PodcastApp extends Application {
// make sure that ClientConfigurator executes its static code
static {
diff --git a/build.gradle b/build.gradle
index b0fb02c44..dcb996909 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,6 @@ project.ext {
minSdkVersion = 10
targetSdkVersion = 23
- multiDexVersion = "1.0.1"
supportVersion = "23.4.0"
commonsioVersion = "2.4"
commonslangVersion = "3.4"