Merge pull request #2862 from MilosKozak/gradleupdate

Gradle update

.travis.yml

@@ -8,7 +8,7 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-28.0.3
+  - build-tools-29.0.2
   - android-28
   - extra-google-m2repository
   - extra-android-m2repository

app/build.gradle

@@ -1,10 +1,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
 
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.hiya:jacoco-android:0.2'
     }
 }
 apply plugin: 'com.android.application'
@@ -12,7 +14,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'jacoco-android'
+//apply plugin: 'jacoco-android'
+apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.google.firebase.crashlytics'
 
 jacoco {

build.gradle

@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Feb 29 21:28:06 CET 2020
+#Tue Jul 28 23:15:57 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

wear/build.gradle

@@ -1,14 +1,17 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
 
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.hiya:jacoco-android:0.2'
     }
 }
 apply plugin: 'com.android.application'
-apply plugin: 'jacoco-android'
+//apply plugin: 'jacoco-android'
+apply plugin: 'com.hiya.jacoco-android'
 
 jacoco {
     toolVersion = "0.8.3"