Updated plug-in version to 0.6.2

Change-Id: I3c8ac610467092da38389339bb9fa284430ec79b

42 files changed, 48 insertions, 41 deletions

diff --git a/build.gradle b/build.gradle
index b69d6ef..334a7d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
     }
 
     project.ext {
-        baseVersion = '0.6.1'
+        baseVersion = '0.6.2'
     }
 
     task disableTestFailures << {
diff --git a/changelog.txt b/changelog.txt
index 75804b1..1e66f7b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+0.6.2
+- Lint now picks up the SDK home from sdk.dir in local.properties
+- Error message shown when using an unsupported version of Gradle now explains how to update the Gradle wrapper
+- Merged resource files no longer place their source markers into the R file as comments
+- Project path can contain '--' (two dashes)
+- Internal changes to improve integration with Android Studio
+
 0.6.1
 
 - Fixed issues with lint task found in 0.6.0
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 4b1fd78..375e6fd 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
@@ -49,7 +49,7 @@ import java.util.Set;
 
 public class AndroidProjectTest extends TestCase {
 
-    private final static String MODEL_VERSION = "0.6.1-SNAPSHOT";
+    private final static String MODEL_VERSION = "0.6.2-SNAPSHOT";
 
     private static final Map<String, ProjectData> sProjectModelMap = Maps.newHashMap();
 
diff --git a/tests/3rdPartyTests/build.gradle b/tests/3rdPartyTests/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/3rdPartyTests/buildSrc/build.gradle b/tests/3rdPartyTests/buildSrc/build.gradle
index 63f90da..6c0d29a 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.6.1-SNAPSHOT'
+    compile 'com.android.tools.build:builder-test-api:0.6.2-SNAPSHOT'
 }
\ No newline at end of file
diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index 7a6de38..df53f7f 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/api/build.gradle b/tests/api/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index 78dd4c4..4fbde6a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/autorepo/build.gradle b/tests/autorepo/build.gradle
index 28e44b2..313156c 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 5c53fee..6857ff1 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 67d0aa1..7a8f9ef 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencyChecker/build.gradle b/tests/dependencyChecker/build.gradle
index 3c79a45..7b84b2b 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index ed0938a..8f1dfdd 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index 78dd4c4..4fbde6a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index 78dd4c4..4fbde6a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index 9b2f4d4..a095403 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/libProguard/build.gradle b/tests/libProguard/build.gradle
index 49a7c85..92e0397 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardConsumerFiles/build.gradle b/tests/libProguardConsumerFiles/build.gradle
index 79d603a..b0dddb9 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardJarDep/build.gradle b/tests/libProguardJarDep/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/libProguardLibDep/build.gradle b/tests/libProguardLibDep/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/libTestDep/build.gradle b/tests/libTestDep/build.gradle
index cbd1ae2..b26298e 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index 78dd4c4..4fbde6a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index 703fbea..6849244 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 6c0cac0..d76a9ad 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/multiproject/build.gradle b/tests/multiproject/build.gradle
index 703fbea..6849244 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index ec04767..f2452c3 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 8e0914f..5e62544 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index 69e9243..83413a1 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index eb18346..a7e3285 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
index 0568fec..5c6117e 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguardLib/build.gradle b/tests/proguardLib/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/renamedApk/build.gradle b/tests/renamedApk/build.gradle
index 96df8f8..8742f7f 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index d9bfc39..7e8b430 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscriptInLib/build.gradle b/tests/renderscriptInLib/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 0402878..43e341b 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index d0b83a4..3dd0d42 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index f22b22e..37a3bf0 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index a4d184a..ce5d2b7 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/sameNamedLibs/build.gradle b/tests/sameNamedLibs/build.gradle
index 78dd4c4..4fbde6a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }
 
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index 74c2741..365b54a 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.6.1-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
     }
 }