Move to Gradle 1.9
Change-Id: I71163cdbf756d2e4699b00f03805e6db1016e198
diff --git a/changelog.txt b/changelog.txt
index ea7659f..563b9c7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
0.7.0
+- Requires Gradle 1.9
- Switch to ProGuard 4.10
- Added ability to test proguarded (obfuscated) apps.
- Jar files are now pre-dexed for faster dexing.
diff --git a/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/ClassPageRenderer.java b/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/ClassPageRenderer.java
index 223ca76..ee31146 100644
--- a/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/ClassPageRenderer.java
+++ b/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/ClassPageRenderer.java
@@ -21,7 +21,7 @@
import com.google.common.collect.Sets;
import org.gradle.api.internal.ErroringAction;
import org.gradle.api.internal.html.SimpleHtmlWriter;
-import org.gradle.api.internal.tasks.testing.junit.report.TestFailure;
+import org.gradle.api.internal.tasks.testing.junit.result.TestFailure;
import org.gradle.reporting.CodePanelRenderer;
import java.io.IOException;
diff --git a/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/TestResult.java b/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/TestResult.java
index a4435d5..90ecc8a 100644
--- a/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/TestResult.java
+++ b/gradle/src/fromGradle/groovy/com/android/build/gradle/internal/test/report/TestResult.java
@@ -15,7 +15,7 @@
*/
package com.android.build.gradle.internal.test.report;
-import org.gradle.api.internal.tasks.testing.junit.report.TestFailure;
+import org.gradle.api.internal.tasks.testing.junit.result.TestFailure;
import org.gradle.api.internal.tasks.testing.junit.report.TestResultModel;
import java.util.ArrayList;
@@ -101,7 +101,7 @@
public void addFailure(String message, String stackTrace,
String deviceName, String projectName, String flavorName) {
classResults.failed(this, deviceName, projectName, flavorName);
- failures.add(new TestFailure(message, stackTrace));
+ failures.add(new TestFailure(message, stackTrace, null));
}
public void ignored() {
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index de4a457..405ef32 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -127,7 +127,7 @@
public abstract class BasePlugin {
protected final static String DIR_BUNDLES = "bundles";
- public static final String GRADLE_MIN_VERSION = "1.8"
+ public static final String GRADLE_MIN_VERSION = "1.9"
public static final String[] GRADLE_SUPPORTED_VERSIONS = [ GRADLE_MIN_VERSION ]
public static final String INSTALL_GROUP = "Install"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4c7344e..b5d9920 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=../../../external/gradle/gradle-1.8-bin.zip
+distributionUrl=../../../external/gradle/gradle-1.9-bin.zip
