diff options
| -rw-r--r-- | app/build.gradle | 24 | ||||
| -rw-r--r-- | app/src/main/res/xml/network_security_config.xml | 7 | ||||
| -rw-r--r-- | build.gradle | 7 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 16 insertions, 24 deletions
diff --git a/app/build.gradle b/app/build.gradle index f0330b0..e82a569 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,18 +1,18 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { - applicationId "org.traccar.manager" + applicationId 'org.traccar.manager' minSdkVersion 19 - targetSdkVersion 27 - versionCode 15 - versionName "2.5" + targetSdkVersion 28 + versionCode 16 + versionName '2.6' } - flavorDimensions "default" + flavorDimensions 'default' productFlavors { regular google @@ -20,14 +20,12 @@ android { } dependencies { - compile 'com.android.support:design:27.1.0' - testCompile 'junit:junit:4.12' - testCompile 'org.robolectric:robolectric:3.6.1' - googleCompile 'com.google.firebase:firebase-core:11.8.0' - googleCompile 'com.crashlytics.sdk.android:crashlytics:2.9.1' + compile 'com.android.support:design:28.0.0-rc01' + googleCompile 'com.google.firebase:firebase-core:16.0.1' + googleCompile 'com.crashlytics.sdk.android:crashlytics:2.9.4' } -if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) { +if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) { apply plugin: 'com.google.gms.google-services' apply plugin: 'io.fabric' diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index 8a76775..2439f15 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -1,9 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <network-security-config> - <base-config cleartextTrafficPermitted="true"> - <trust-anchors> - <certificates src="system" /> - <certificates src="user" /> - </trust-anchors> - </base-config> + <base-config cleartextTrafficPermitted="true" /> </network-security-config> diff --git a/build.gradle b/build.gradle index 48c8102..f67684e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.google.gms:google-services:3.1.1' - classpath 'io.fabric.tools:gradle:1.25.1' + classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.google.gms:google-services:4.0.2' + classpath 'io.fabric.tools:gradle:1.25.4' } } @@ -15,6 +15,5 @@ allprojects { repositories { google() jcenter() - maven { url 'https://maven.fabric.io/public' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f0f9be..8941bfb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip |