Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Multidex declaration #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove Multidex declaration #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions LearningMachine/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ android {
}

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled true
}

compileOptions {
Expand Down Expand Up @@ -67,9 +66,6 @@ android {
if (project.hasProperty("devBuild")) {
// don't package all resources for dev builds
resConfigs("en", "xxhdpi")

// avoid legacy multidex
minSdkVersion 21
}
}
staging {
Expand Down Expand Up @@ -118,7 +114,6 @@ android {
}

final SUPPORT_VERSION = '27.1.1'
final MULTIDEX_VERSION = '1.0.1'
final DAGGER_VERSION = '2.22.1'
final SLF4J_VERSION = '1.7.25'
final SPONGYCASTLE_VERSION = '1.56.0.0'
Expand Down Expand Up @@ -169,7 +164,6 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.multidex:multidex:2.0.0'
implementation "org.slf4j:slf4j-log4j12:$SLF4J_VERSION"
implementation "com.madgag.spongycastle:core:$SPONGYCASTLE_VERSION"
implementation "com.google.protobuf:protobuf-java:$PROTOBUF_VERSION"
Expand Down Expand Up @@ -213,7 +207,6 @@ dependencies {
testImplementation "org.json:json:20140107"
testImplementation "org.mockito:mockito-core:$MOCKITO_VERSION"
testImplementation "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
testImplementation "org.robolectric:shadows-multidex:$ROBOLECTRIC_VERSION"
testImplementation "joda-time:joda-time:$JODATIME_VERSION"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}
4 changes: 2 additions & 2 deletions LearningMachine/app/src/main/java/com/learningmachine/android/app/LMApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.learningmachine.android.app;

import android.app.Application;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.multidex.MultiDexApplication;
import android.webkit.WebView;

import com.learningmachine.android.app.data.CertificateManager;
Expand All @@ -27,7 +27,7 @@

import timber.log.Timber;

public class LMApplication extends MultiDexApplication {
public class LMApplication extends Application {

protected LMGraph mGraph;

Expand Down