From 49ef5619a643424d17c5c03bdb878144c998e3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20Mac=20Gillicuddy?= Date: Fri, 6 Mar 2020 13:07:53 +0000 Subject: [PATCH] #3469 Update Gradle Play Publisher to resolve issues with travis build (#3470) * #3469 Update Gradle Play Publisher to resolve issues with travis build - update GPP/Gradle and use jacoco-android fork with gradle 6.0 support * #3469 Update Gradle Play Publisher to resolve issues with travis build - remove extraneous space --- app/build.gradle | 4 ++-- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac199d7e6..fcaaea621 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ 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() diff --git a/build.gradle b/build.gradle index 9cfcdfbaf..f9213b054 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 f31d5176b..55c173176 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