From a3d43294cec4fe4da753d2a1b9782b43e239b09d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 10 Jun 2020 21:14:19 -0700
Subject: [PATCH] Update project and tests

---
 app/build.gradle                                      | 11 ++++++-----
 .../java/org/traccar/client/DatabaseHelperTest.java   |  2 ++
 .../org/traccar/client/ProtocolFormatterTest.java     |  2 ++
 .../java/org/traccar/client/RequestManagerTest.java   |  5 ++++-
 build.gradle                                          |  5 ++---
 gradle.properties                                     |  1 -
 gradle/wrapper/gradle-wrapper.properties              |  2 +-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5532d92..d42fea7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         buildConfigField 'boolean', 'HIDDEN_APP', 'false'
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 63
-        versionName '6.2'
+        versionCode 64
+        versionName '6.3'
     }
 
     lintOptions {
@@ -36,18 +36,19 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
     implementation 'androidx.preference:preference:1.1.1'
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.1'
-    googleImplementation 'com.google.firebase:firebase-core:17.3.0'
+    googleImplementation 'com.google.firebase:firebase-core:17.4.3'
     googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    googleImplementation 'com.google.firebase:firebase-analytics:17.4.3'
     googleImplementation 'com.google.android.gms:play-services-location:17.0.0'
 }
 
 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/app/src/test/java/org/traccar/client/DatabaseHelperTest.java b/app/src/test/java/org/traccar/client/DatabaseHelperTest.java
index 94433e0..714e214 100644
--- a/app/src/test/java/org/traccar/client/DatabaseHelperTest.java
+++ b/app/src/test/java/org/traccar/client/DatabaseHelperTest.java
@@ -2,6 +2,7 @@
 package org.traccar.client;
 
 import android.location.Location;
+import android.os.Build;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,6 +15,7 @@ import java.util.Date;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class DatabaseHelperTest {
 
diff --git a/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java b/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
index cdc2083..313e27e 100644
--- a/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
+++ b/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
@@ -2,6 +2,7 @@
 package org.traccar.client;
 
 import android.location.Location;
+import android.os.Build;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,6 +13,7 @@ import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class ProtocolFormatterTest {
 
diff --git a/app/src/test/java/org/traccar/client/RequestManagerTest.java b/app/src/test/java/org/traccar/client/RequestManagerTest.java
index 35356f9..ccf7b6e 100644
--- a/app/src/test/java/org/traccar/client/RequestManagerTest.java
+++ b/app/src/test/java/org/traccar/client/RequestManagerTest.java
@@ -1,6 +1,8 @@
 
 package org.traccar.client;
 
+import android.os.Build;
+
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +11,11 @@ import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertTrue;
 
+@Config(sdk = Build.VERSION_CODES.P)
 @RunWith(RobolectricTestRunner.class)
 public class RequestManagerTest {
 
-    @Ignore
+    @Ignore("Not a real unit test")
     @Test
     public void testSendRequest() throws Exception {
 
diff --git a/build.gradle b/build.gradle
index 60e061a..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.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.28.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 55a0df3..dbb7bf7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,2 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5591bc..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-6.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip