kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-04 03:06:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1821 from kiwix/bugfix/macgills/multidex-debug-only

Browse Source 
Bugfix/macgills/multidex debug only
This commit is contained in:
Seán Mac Gillicuddy 2020-02-27 14:05:06 +00:00 committed by GitHub
commit ffeaef34b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -11,7 +11,7 @@ apply(from = rootProject.file("jacoco.gradle"))
ext { ext {
set("versionMajor", 3) set("versionMajor", 3)
set("versionMinor", 2) set("versionMinor", 2)
set("versionPatch", 0) set("versionPatch", 1)
} }
fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}" fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}"

2
buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
View File

@ -52,12 +52,12 @@ class AllProjectConfigurer {
setMinSdkVersion(Config.minSdk) setMinSdkVersion(Config.minSdk)
setTargetSdkVersion(Config.targetSdk) setTargetSdkVersion(Config.targetSdk)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled = true
} }
buildTypes { buildTypes {
getByName("debug") { getByName("debug") {
isTestCoverageEnabled = true isTestCoverageEnabled = true
multiDexEnabled = true
} }
} }

8
core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.java
View File

@ -17,13 +17,14 @@
*/ */
package org.kiwix.kiwixmobile.core; package org.kiwix.kiwixmobile.core;
import android.app.Application;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.StrictMode; import android.os.StrictMode;
import android.util.Log; import android.util.Log;
import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import androidx.multidex.MultiDexApplication; import androidx.multidex.MultiDex;
import com.jakewharton.threetenabp.AndroidThreeTen; import com.jakewharton.threetenabp.AndroidThreeTen;
import java.io.File; import java.io.File;
import java.io.IOException; 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.di.components.DaggerCoreComponent;
import org.kiwix.kiwixmobile.core.downloader.DownloadMonitor; 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 CoreApp app;
private static CoreComponent coreComponent; private static CoreComponent coreComponent;
@ -64,6 +65,9 @@ public abstract class CoreApp extends MultiDexApplication {
@Override @Override
protected void attachBaseContext(Context base) { protected void attachBaseContext(Context base) {
super.attachBaseContext(base); super.attachBaseContext(base);
if (BuildConfig.DEBUG) {
MultiDex.install(this);
}
app = this; app = this;
setCoreComponent(DaggerCoreComponent.builder() setCoreComponent(DaggerCoreComponent.builder()
.context(this) .context(this)