Skip to content

Commit 49ef561

Browse files
authored
commons-app#3469 Update Gradle Play Publisher to resolve issues with travis build (commons-app#3470)
* commons-app#3469 Update Gradle Play Publisher to resolve issues with travis build - update GPP/Gradle and use jacoco-android fork with gradle 6.0 support * commons-app#3469 Update Gradle Play Publisher to resolve issues with travis build - remove extraneous space
1 parent fa1d8bc commit 49ef561

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id 'com.github.triplet.play' version '2.2.1' apply false
2+
id 'com.github.triplet.play' version '2.7.2' apply false
33
}
44
apply from: '../gitutils.gradle'
55
apply plugin: 'com.android.application'
66
apply plugin: 'kotlin-android'
77
apply plugin: 'kotlin-kapt'
8-
apply plugin: 'jacoco-android'
8+
apply plugin: "com.hiya.jacoco-android"
99
apply from: 'quality.gradle'
1010

1111
def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()

build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ buildscript {
44
google()
55
jcenter()
66
mavenCentral()
7+
maven { url "https://plugins.gradle.org/m2/" }
78
}
89
dependencies {
910
classpath 'com.android.tools.build:gradle:3.6.1'
10-
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
11+
classpath "com.hiya:jacoco-android:0.2"
1112
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
1213
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
1314
classpath 'org.codehaus.groovy:groovy-all:2.4.15'

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip

0 commit comments

Comments
 (0)