aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle27
-rw-r--r--build.gradle10
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
3 files changed, 19 insertions, 20 deletions
diff --git a/app/build.gradle b/app/build.gradle
index f5211a8..f0330b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,40 +1,35 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
- buildToolsVersion "26.0.1"
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
defaultConfig {
applicationId "org.traccar.manager"
minSdkVersion 19
- targetSdkVersion 26
- versionCode 14
- versionName "2.4"
+ targetSdkVersion 27
+ versionCode 15
+ versionName "2.5"
}
+ flavorDimensions "default"
productFlavors {
regular
google
}
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
}
dependencies {
- compile 'com.android.support:design:26.0.1'
+ compile 'com.android.support:design:27.1.0'
testCompile 'junit:junit:4.12'
- testCompile 'org.robolectric:robolectric:3.0'
- googleCompile 'com.google.firebase:firebase-core:11.2.0'
- googleCompile 'com.google.firebase:firebase-crash:11.2.0'
+ 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'
}
if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {
apply plugin: 'com.google.gms.google-services'
+ apply plugin: 'io.fabric'
task copyJson(type: Copy) {
from '../../traccar-shared/google-services'
diff --git a/build.gradle b/build.gradle
index 9327e1d..48c8102 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,20 @@
buildscript {
repositories {
+ google()
jcenter()
+ maven { url 'https://maven.fabric.io/public' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
- classpath 'com.google.gms:google-services:3.1.0'
+ 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'
}
}
allprojects {
repositories {
- jcenter()
google()
+ jcenter()
+ maven { url 'https://maven.fabric.io/public' }
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bf1b63c..3f0f9be 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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip