From 790e5fd2a1110e9440db40447e564ac393cb99b5 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 24 Oct 2016 08:24:41 -0700 Subject: [PATCH] Update gradle wrapper Code coverage is disabled in V2 to workaround https://code.google.com/p/android/issues/detail?id=226070 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=137032839 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 8e9032be70..9d14c36b1b 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.2.1' classpath 'com.novoda:bintray-release:0.3.4' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04363c87a9..c41838fae2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 01 11:39:15 BST 2016 +#Mon Oct 24 14:40:37 BST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index aaadc9cdd4..dd1d5c3c87 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -35,9 +35,11 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } - debug { - testCoverageEnabled = true - } + // Re-enable test coverage when the following issue is fixed: + // https://code.google.com/p/android/issues/detail?id=226070 + // debug { + // testCoverageEnabled = true + // } } lintOptions {