Этот коммит содержится в:
Anton Tananaev
2020-09-28 21:21:16 -07:00
родитель ceb15c1378
Коммит e8a1e015d4
2 изменённых файлов: 15 добавлений и 3 удалений
+11
Просмотреть файл
@@ -10,6 +10,16 @@ android {
targetSdkVersion 29 targetSdkVersion 29
versionCode 65 versionCode 65
versionName '6.4' versionName '6.4'
multiDexEnabled true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
} }
lintOptions { lintOptions {
@@ -37,6 +47,7 @@ android {
dependencies { dependencies {
implementation 'com.google.android.material:material:1.3.0-alpha02' implementation 'com.google.android.material:material:1.3.0-alpha02'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13'
testImplementation 'org.robolectric:robolectric:4.1' testImplementation 'org.robolectric:robolectric:4.1'
+4 -3
Просмотреть файл
@@ -1,5 +1,5 @@
/* /*
* Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) * Copyright 2016 - 2020 Anton Tananaev (anton@traccar.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
package org.traccar.client; package org.traccar.client;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Application;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
@@ -27,7 +26,9 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; 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"; public static final String PRIMARY_CHANNEL = "default";