Remove multidex again

app/build.gradle

@@ -3,12 +3,22 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: "com.android.application"
 apply plugin: "me.tatarka.retrolambda"
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.getkeepsafe.dexcount'
 
 repositories {
     maven { url "https://jitpack.io" }
     mavenCentral()
 }
 
+buildscript {
+    repositories {
+       jcenter()
+    }
+    dependencies {
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.1'
+    }
+}
+
 def getMyVersionName() {
     def parsedManifestXml = (new XmlSlurper())
             .parse("${projectDir}/src/main/AndroidManifest.xml")
@@ -132,7 +142,6 @@ dependencies {
     } else {
         System.out.println("app: free build hack, skipping some dependencies")
     }
-    compile 'com.android.support:multidex:1.0.1'
     compile "com.android.support:support-v4:$supportVersion"
     compile "com.android.support:appcompat-v7:$supportVersion"
     compile "com.android.support:design:$supportVersion"

app/proguard.cfg

@@ -2,6 +2,7 @@
 -renamesourcefileattribute SourceFile
 -keepattributes SourceFile,LineNumberTable
 -optimizations !code/allocation/variable
+-optimizationpasses 5
 
 -dontpreverify
 -repackageclasses ''
@@ -9,7 +10,6 @@
 -keepattributes *Annotation*
 
 #-injars libs/presto_client-0.8.5.jar
-
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service

app/src/main/java/de/danoeh/antennapod/PodcastApp.java

@@ -14,7 +14,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 {