From f57e866217ef5f8cabd70d1d7f2b1a7b32f6896d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 10 Jun 2020 21:25:49 -0700 Subject: Update project files --- app/build.gradle | 15 ++++++++------- build.gradle | 7 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f30d283..a3ba262 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId 'org.traccar.manager' minSdkVersion 19 targetSdkVersion 29 - versionCode 20 - versionName '2.9' + versionCode 21 + versionName '2.10' } flavorDimensions 'default' @@ -21,15 +21,16 @@ android { } dependencies { - implementation 'com.google.android.material:material:1.0.0' - googleImplementation 'com.google.firebase:firebase-core:17.2.0' - googleImplementation 'com.google.firebase:firebase-messaging:20.0.0' - googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' + implementation 'com.google.android.material:material:1.1.0' + googleImplementation 'com.google.firebase:firebase-core:17.4.3' + googleImplementation 'com.google.firebase:firebase-analytics:17.4.3' + googleImplementation 'com.google.firebase:firebase-messaging:20.2.0' + googleImplementation 'com.google.firebase:firebase-crashlytics:17.0.1' } if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) { apply plugin: 'com.google.gms.google-services' - apply plugin: 'io.fabric' + apply plugin: 'com.google.firebase.crashlytics' task copyJson(type: Copy) { from '../../traccar-shared/google-services' diff --git a/build.gradle b/build.gradle index a4f4693..c65f011 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,11 @@ buildscript { repositories { google() jcenter() - maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' - classpath 'com.google.gms:google-services:4.3.2' - classpath 'io.fabric.tools:gradle:1.25.4' + classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01a286e..84337ad 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-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip -- cgit v1.2.3