diff options
| author | Varun Barad <barad.varun29@gmail.com> | 2016-12-04 08:45:06 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-04 08:45:06 +0530 |
| commit | 9406108c61e42b6ad8942e5cce0c87c01c061473 (patch) | |
| tree | f80c32af1c4a30f979798ab7e09482984f21d93b | |
| parent | b4233f004c5df3fcaae08b0b88e4c0bd8ae3a747 (diff) | |
| parent | 28f4ba968d50cff1a770c6a81e5fa352569af50d (diff) | |
| download | AntennaPod-9406108c61e42b6ad8942e5cce0c87c01c061473.zip | |
Merge pull request #2 from VarunBarad/launch-screen
Launch screen
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/PodcastApp.java | 4 | ||||
| -rw-r--r-- | build.gradle | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index d15427aef..b2ddb0101 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,6 +30,7 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion + multiDexEnabled true versionCode getMyVersionCode() versionName "${getMyVersionName()}" testApplicationId "de.test.antennapod" @@ -126,6 +127,7 @@ 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 f6a8db5fb..25af9bce3 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 Application { +public class PodcastApp extends MultiDexApplication { // make sure that ClientConfigurator executes its static code static { diff --git a/build.gradle b/build.gradle index dcb996909..b0fb02c44 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,7 @@ project.ext { minSdkVersion = 10 targetSdkVersion = 23 + multiDexVersion = "1.0.1" supportVersion = "23.4.0" commonsioVersion = "2.4" commonslangVersion = "3.4" |