Updated plug-in version to 0.6.

This CL also adds Gradle 1.8 as supported version.

Change-Id: Ibdac815551ef854c3896d72445d44090f87045ff

42 files changed, 42 insertions, 42 deletions

diff --git a/build.gradle b/build.gradle
index 145db7b..77968d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ subprojects {
     }
 
     project.ext {
-        baseVersion = '0.5.0'
+        baseVersion = '0.6.0'
     }
 
     task disableTestFailures << {
diff --git a/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java b/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
index 87e856a..48679a0 100644
--- a/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
+++ b/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
@@ -48,7 +48,7 @@ import java.util.Set;
 
 public class AndroidProjectTest extends TestCase {
 
-    private final static String MODEL_VERSION = "0.5.0-SNAPSHOT";
+    private final static String MODEL_VERSION = "0.6.0-SNAPSHOT";
 
     private static final Map<String, ProjectData> sProjectModelMap = Maps.newHashMap();
 
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 aaa1fdc..6376791 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -121,7 +121,7 @@ public abstract class BasePlugin {
     protected final static String DIR_BUNDLES = "bundles";
 
     public static final String GRADLE_MIN_VERSION = "1.6"
-    public static final String[] GRADLE_SUPPORTED_VERSIONS = [ GRADLE_MIN_VERSION, "1.7" ]
+    public static final String[] GRADLE_SUPPORTED_VERSIONS = [ GRADLE_MIN_VERSION, "1.7", "1.8" ]
 
     public static final String INSTALL_GROUP = "Install"
 
diff --git a/tests/3rdPartyTests/build.gradle b/tests/3rdPartyTests/build.gradle
index 62a4405..7c38050 100644
--- a/tests/3rdPartyTests/build.gradle
+++ b/tests/3rdPartyTests/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/3rdPartyTests/buildSrc/build.gradle b/tests/3rdPartyTests/buildSrc/build.gradle
index 2b78104..dd058e1 100644
--- a/tests/3rdPartyTests/buildSrc/build.gradle
+++ b/tests/3rdPartyTests/buildSrc/build.gradle
@@ -6,5 +6,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.tools.build:builder-test-api:0.5.0-SNAPSHOT'
+    compile 'com.android.tools.build:builder-test-api:0.6.0-SNAPSHOT'
 }
\ No newline at end of file
diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index 2890aed..b22425e 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/api/build.gradle b/tests/api/build.gradle
index 62a4405..7c38050 100644
--- a/tests/api/build.gradle
+++ b/tests/api/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index 62a4405..7c38050 100644
--- a/tests/applibtest/build.gradle
+++ b/tests/applibtest/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index f210fcf..14ae34b 100644
--- a/tests/assets/build.gradle
+++ b/tests/assets/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index 62a4405..7c38050 100644
--- a/tests/attrOrder/build.gradle
+++ b/tests/attrOrder/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/autorepo/build.gradle b/tests/autorepo/build.gradle
index 70afd2e..26f3cd5 100644
--- a/tests/autorepo/build.gradle
+++ b/tests/autorepo/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 38dcc52..3c830df 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 0f15c02..4582635 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencyChecker/build.gradle b/tests/dependencyChecker/build.gradle
index d591405..fdbf591 100644
--- a/tests/dependencyChecker/build.gradle
+++ b/tests/dependencyChecker/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index edc6fa5..4c99423 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index f210fcf..14ae34b 100644
--- a/tests/flavorlib/build.gradle
+++ b/tests/flavorlib/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index f210fcf..14ae34b 100644
--- a/tests/flavorlibWithFailedTests/build.gradle
+++ b/tests/flavorlibWithFailedTests/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index cd81f99..0dbf29d 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/libProguard/build.gradle b/tests/libProguard/build.gradle
index 6a522ee..8b472b1 100644
--- a/tests/libProguard/build.gradle
+++ b/tests/libProguard/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardConsumerFiles/build.gradle b/tests/libProguardConsumerFiles/build.gradle
index fbefef8..72e6f6b 100644
--- a/tests/libProguardConsumerFiles/build.gradle
+++ b/tests/libProguardConsumerFiles/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardJarDep/build.gradle b/tests/libProguardJarDep/build.gradle
index 62a4405..7c38050 100644
--- a/tests/libProguardJarDep/build.gradle
+++ b/tests/libProguardJarDep/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/libProguardLibDep/build.gradle b/tests/libProguardLibDep/build.gradle
index 62a4405..7c38050 100644
--- a/tests/libProguardLibDep/build.gradle
+++ b/tests/libProguardLibDep/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/libTestDep/build.gradle b/tests/libTestDep/build.gradle
index 0be14ae..655638a 100644
--- a/tests/libTestDep/build.gradle
+++ b/tests/libTestDep/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index f210fcf..14ae34b 100644
--- a/tests/libsTest/build.gradle
+++ b/tests/libsTest/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index 6c540c4..e940465 100644
--- a/tests/localJars/build.gradle
+++ b/tests/localJars/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 37efffa..3948b71 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/multiproject/build.gradle b/tests/multiproject/build.gradle
index 6c540c4..e940465 100644
--- a/tests/multiproject/build.gradle
+++ b/tests/multiproject/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index 290e765..c059f4b 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index c88c4c0..d127d43 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index b3d7fcd..96f654e 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index 9b909a9..1996026 100644
--- a/tests/pkgOverride/build.gradle
+++ b/tests/pkgOverride/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
index 394a039..534e74c 100644
--- a/tests/proguard/build.gradle
+++ b/tests/proguard/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguardLib/build.gradle b/tests/proguardLib/build.gradle
index 62a4405..7c38050 100644
--- a/tests/proguardLib/build.gradle
+++ b/tests/proguardLib/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/renamedApk/build.gradle b/tests/renamedApk/build.gradle
index 5ff689c..b16da8a 100644
--- a/tests/renamedApk/build.gradle
+++ b/tests/renamedApk/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index 7530870..2c4d3f0 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscriptInLib/build.gradle b/tests/renderscriptInLib/build.gradle
index 62a4405..7c38050 100644
--- a/tests/renderscriptInLib/build.gradle
+++ b/tests/renderscriptInLib/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index e41f301..3fa2f68 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index b7d8e4a..f20594a 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index ca226de..4c95e77 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index d2f6ae6..29250cf 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/sameNamedLibs/build.gradle b/tests/sameNamedLibs/build.gradle
index f210fcf..14ae34b 100644
--- a/tests/sameNamedLibs/build.gradle
+++ b/tests/sameNamedLibs/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index 62a4405..7c38050 100644
--- a/tests/tictactoe/build.gradle
+++ b/tests/tictactoe/build.gradle
@@ -3,6 +3,6 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }