Этот коммит содержится в:
Anton Tananaev
2018-03-18 21:38:14 +13:00
родитель 1c8ac87d4e
Коммит d7c80723fc
3 изменённых файлов: 19 добавлений и 20 удалений
+11 -16
Просмотреть файл
@@ -1,40 +1,35 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 27
buildToolsVersion "26.0.1" buildToolsVersion "27.0.3"
defaultConfig { defaultConfig {
applicationId "org.traccar.manager" applicationId "org.traccar.manager"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 26 targetSdkVersion 27
versionCode 14 versionCode 15
versionName "2.4" versionName "2.5"
} }
flavorDimensions "default"
productFlavors { productFlavors {
regular regular
google google
} }
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt')
}
}
} }
dependencies { dependencies {
compile 'com.android.support:design:26.0.1' compile 'com.android.support:design:27.1.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.robolectric:robolectric:3.6.1'
googleCompile 'com.google.firebase:firebase-core:11.2.0' googleCompile 'com.google.firebase:firebase-core:11.8.0'
googleCompile 'com.google.firebase:firebase-crash:11.2.0' googleCompile 'com.crashlytics.sdk.android:crashlytics:2.9.1'
} }
if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) { if (getGradle().getStartParameter().getTaskRequests().toString().contains("Google")) {
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric'
task copyJson(type: Copy) { task copyJson(type: Copy) {
from '../../traccar-shared/google-services' from '../../traccar-shared/google-services'
+7 -3
Просмотреть файл
@@ -1,16 +1,20 @@
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
maven { url 'https://maven.fabric.io/public' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.google.gms:google-services:3.1.0' classpath 'com.google.gms:google-services:3.1.1'
classpath 'io.fabric.tools:gradle:1.25.1'
} }
} }
allprojects { allprojects {
repositories { repositories {
jcenter()
google() google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
} }
} }
+1 -1
Просмотреть файл
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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