Skip to content

Commit

Permalink
Update project and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tananaev committed Aug 9, 2018
1 parent d7c8072 commit 82171fb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 24 deletions.
24 changes: 11 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
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
}
}

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'

Expand Down
7 changes: 1 addition & 6 deletions app/src/main/res/xml/network_security_config.xml
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ 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'
}
}

allprojects {
repositories {
google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 82171fb

Please sign in to comment.