Update project files
Этот коммит содержится в:
+11
-17
@@ -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")) {
|
||||
|
||||
+2
-2
@@ -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'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Ссылка в новой задаче
Block a user