From cc6c8a23f6fcbacfda508f5df93851419b90f715 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 7 Jan 2018 09:23:14 +1300 Subject: [PATCH] Update project files --- app/build.gradle | 28 ++++++++++-------------- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7e9f457..62261cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,22 +1,23 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "org.traccar.client" buildConfigField "boolean", "HIDDEN_APP", "false" minSdkVersion 15 - targetSdkVersion 26 - versionCode 42 - versionName '5.5' + targetSdkVersion 27 + versionCode 43 + versionName '5.6' } lintOptions { checkReleaseBuilds false } + flavorDimensions "default" productFlavors { regular google @@ -25,22 +26,15 @@ android { buildConfigField "boolean", "HIDDEN_APP", "true" } } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt') - } - } } dependencies { - compile 'com.android.support:design:26.1.0' - compile 'com.mapzen.android:lost:3.0.2' + compile 'com.android.support:design:27.0.2' + compile 'com.mapzen.android:lost:3.0.4' testCompile 'junit:junit:4.12' - testCompile 'org.robolectric:robolectric:3.4.2' - googleCompile 'com.google.firebase:firebase-core:11.6.0' - googleCompile 'com.google.firebase:firebase-crash:11.6.0' + testCompile 'org.robolectric:robolectric:3.6.1' + googleCompile 'com.google.firebase:firebase-core:11.8.0' + googleCompile 'com.google.firebase:firebase-crash:11.8.0' } if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) { diff --git a/build.gradle b/build.gradle index 9327e1d..2755079 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ buildscript { jcenter() } 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' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf1b63c..57c7d2d 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.4.1-all.zip