From 4ac27dcd4e8bf1ba569aadda777533546efa051d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 4 Apr 2018 21:26:31 +0200 Subject: [PATCH 1/2] Update android gradle plugin to 3.1.0 version. Signed-off-by: Yahor Berdnikau --- build.gradle | 1 + dependencies.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 25ea3d17..18226f8e 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ allprojects { repositories { jcenter() + google() } } diff --git a/dependencies.gradle b/dependencies.gradle index 6e1e4e57..69b58c79 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ ext.versions = [ compileSdk : 27, gradle : '4.5.1', - androidTools : "3.0.1", + androidTools : "3.1.0", ktlint : "0.20.0", ktlintGradle : "3.2.0", detekt : "1.0.0.RC6-4", From e7caddaf9972ebb0056c4305142fa48fb18728b9 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 5 Apr 2018 20:48:43 +0200 Subject: [PATCH 2/2] Add workaround for transitive dependency conflict. Signed-off-by: Yahor Berdnikau --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 18226f8e..b839f789 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,9 @@ buildscript { classpath gradlePlugins.kotlin classpath gradlePlugins.ktlintGradle classpath gradlePlugins.detekt - classpath gradlePlugins.jacocoAndroid + classpath(gradlePlugins.jacocoAndroid) { + exclude group: 'org.codehaus.groovy', module: 'groovy-all' + } } }