Skip to content

Commit

Permalink
Enable multidex
Browse files Browse the repository at this point in the history
  • Loading branch information
tananaev committed Sep 29, 2020
1 parent ceb15c1 commit e8a1e01
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
11 changes: 11 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ android {
targetSdkVersion 29
versionCode 65
versionName '6.4'
multiDexEnabled true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

packagingOptions {
exclude 'META-INF/DEPENDENCIES'
}

lintOptions {
Expand Down Expand Up @@ -37,6 +47,7 @@ android {

dependencies {
implementation 'com.google.android.material:material:1.3.0-alpha02'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.preference:preference:1.1.1'
testImplementation 'junit:junit:4.13'
testImplementation 'org.robolectric:robolectric:4.1'
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/org/traccar/client/MainApplication.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2017 Anton Tananaev ([email protected])
* Copyright 2016 - 2020 Anton Tananaev ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,6 @@
package org.traccar.client;

import android.annotation.TargetApi;
import android.app.Application;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
Expand All @@ -27,7 +26,9 @@
import android.os.Build;
import android.preference.PreferenceManager;

public class MainApplication extends Application {
import androidx.multidex.MultiDexApplication;

public class MainApplication extends MultiDexApplication {

public static final String PRIMARY_CHANNEL = "default";

Expand Down

0 comments on commit e8a1e01

Please sign in to comment.