From c775979fe00996d417c76abb2b71576d0ae521f0 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Fri, 6 Mar 2020 08:39:34 +0000
Subject: [PATCH 1/2] #3469 Update Gradle Play Publisher to resolve issues with
 travis build - update GPP/Gradle and use jacoco-android fork with gradle 6.0
 support

---
 app/build.gradle                         | 5 +++--
 build.gradle                             | 3 ++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac199d7e67..f0bf2ec2d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,14 @@
 plugins {
-    id 'com.github.triplet.play' version '2.2.1' apply false
+    id 'com.github.triplet.play' version '2.7.2' apply false
 }
 apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'jacoco-android'
+apply plugin: "com.hiya.jacoco-android"
 apply from: 'quality.gradle'
 
+
 def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
 
 if(isRunningOnTravisAndIsNotPRBuild) {
diff --git a/build.gradle b/build.gradle
index 9cfcdfbaf1..f9213b054f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,10 +4,11 @@ buildscript {
         google()
         jcenter()
         mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath "com.hiya:jacoco-android:0.2"
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath 'org.codehaus.groovy:groovy-all:2.4.15'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f31d5176b1..55c1731761 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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.2.2-all.zip

From 58fddf68ac269e194e69fdb5114b0811d80a6520 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Fri, 6 Mar 2020 08:42:51 +0000
Subject: [PATCH 2/2] #3469 Update Gradle Play Publisher to resolve issues with
 travis build - remove extraneous space

---
 app/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f0bf2ec2d5..fcaaea6219 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,6 @@ apply plugin: 'kotlin-kapt'
 apply plugin: "com.hiya.jacoco-android"
 apply from: 'quality.gradle'
 
-
 def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
 
 if(isRunningOnTravisAndIsNotPRBuild) {