diff options
| author | Xavier Ducrohet <xav@google.com> | 2013-08-07 18:41:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-07 18:41:38 +0000 |
| commit | 6425d3e4a400b9e01077b16cbbcbeca8c9cab5f0 (patch) | |
| tree | 975b504bcb1701c4f0819ce549a5dc6ee03570e0 | |
| parent | af6cd55d7ad42a09ea2e1e893adb9a3ec7dadd72 (diff) | |
| parent | c2fe91b1bf3f0c4ecdd7bf48efe8aa51c0a3b4cb (diff) | |
| download | platform_tools_build-version_0.5.tar.gz platform_tools_build-version_0.5.tar.bz2 platform_tools_build-version_0.5.zip | |
Merge changes Ic316410c,I96bdcb71 into version_0.5version_0.5
* changes:
Update plugin to 0.5.6
Move to Gradle 1.7 to build.
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 6232c7a9..252bd0d8 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ subprojects { } project.ext { - baseVersion = '0.5.5' + baseVersion = '0.5.6' } task disableTestFailures << { 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 145b5071..e85c7849 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -119,7 +119,7 @@ import static com.android.builder.BuilderConstants.INSTRUMENT_TEST */ public abstract class BasePlugin { public static final String GRADLE_MIN_VERSION = "1.6" - public static final String[] GRADLE_SUPPORTED_VERSIONS = [ GRADLE_MIN_VERSION ] + public static final String[] GRADLE_SUPPORTED_VERSIONS = [ GRADLE_MIN_VERSION, "1.7" ] public static final String INSTALL_GROUP = "Install" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db938718..ff923bb4 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=../../../external/gradle/gradle-1.6-all.zip +distributionUrl=../../../external/gradle/gradle-1.7-bin.zip |