kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 04:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Redo upgrade of leakcanary, leakcanary 2.0 has androidx dependencies and cannot be included. Remove multidex again

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-05-15 13:59:09 +01:00
parent 4370ee61e9
commit ed6a632af5
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -49,9 +49,6 @@ dependencies {
implementation "com.android.support:support-v4:$supportLibraryVersion" implementation "com.android.support:support-v4:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion" implementation "com.android.support:design:$supportLibraryVersion"
implementation "com.android.support:cardview-v7:$supportLibraryVersion" implementation "com.android.support:cardview-v7:$supportLibraryVersion"
implementation 'com.android.support:multidex:1.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
@ -120,7 +117,7 @@ dependencies {
androidTestImplementation "org.mockito:mockito-android:2.24.5" androidTestImplementation "org.mockito:mockito-android:2.24.5"
// Leak canary // Leak canary
implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' implementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
// Only enable leak canary in debug builds // Only enable leak canary in debug builds
configurations.all { config -> configurations.all { config ->
if (config.name.contains('debug') || config.name.contains("Debug")) { if (config.name.contains('debug') || config.name.contains("Debug")) {
@ -166,7 +163,6 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// See https://github.com/linkedin/dexmaker/issues/65 for why we need the following line. // See https://github.com/linkedin/dexmaker/issues/65 for why we need the following line.
testInstrumentationRunnerArguments.notClass = 'com.android.dex.DexIndexOverflowException' testInstrumentationRunnerArguments.notClass = 'com.android.dex.DexIndexOverflowException'
multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
} }
@ -200,8 +196,6 @@ android {
buildConfigField "boolean", "KIWIX_ERROR_ACTIVITY", "false" buildConfigField "boolean", "KIWIX_ERROR_ACTIVITY", "false"
// True breaks local variables being shown in breakpoints // True breaks local variables being shown in breakpoints
testCoverageEnabled false testCoverageEnabled false
// Needed for instrumentation tests on Pre 5.0
multiDexKeepProguard file('multidex-instrumentation-config.pro')
} }
mock_network { mock_network {

20
app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
View File

@ -18,26 +18,22 @@
package org.kiwix.kiwixmobile; package org.kiwix.kiwixmobile;
import android.app.Activity; import android.app.Activity;
import android.app.Application;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.support.multidex.MultiDexApplication;
import android.util.Log;
import android.support.v7.app.AppCompatDelegate; import android.support.v7.app.AppCompatDelegate;
import android.util.Log;
import com.squareup.leakcanary.LeakCanary; import com.squareup.leakcanary.LeakCanary;
import org.kiwix.kiwixmobile.di.components.ApplicationComponent;
import org.kiwix.kiwixmobile.di.components.DaggerApplicationComponent;
import org.kiwix.kiwixmobile.di.modules.ApplicationModule;
import java.io.File;
import java.io.IOException;
import javax.inject.Inject;
import dagger.android.AndroidInjector; import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector; import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasActivityInjector; import dagger.android.HasActivityInjector;
import java.io.File;
import java.io.IOException;
import javax.inject.Inject;
import org.kiwix.kiwixmobile.di.components.ApplicationComponent;
import org.kiwix.kiwixmobile.di.components.DaggerApplicationComponent;
public class KiwixApplication extends MultiDexApplication implements HasActivityInjector { public class KiwixApplication extends Application implements HasActivityInjector {
private static KiwixApplication application; private static KiwixApplication application;
private static ApplicationComponent applicationComponent; private static ApplicationComponent applicationComponent;