Updated plug-in version to 0.6.0.

Change-Id: I5157bf3a0014093b866bb9d5d501d8c75ee6db68
diff --git a/build.gradle b/build.gradle
index 4becf63..f7fccc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@
     }
 
     project.ext {
-        baseVersion = '0.5.7'
+        baseVersion = '0.6.0'
     }
 
     task disableTestFailures << {
diff --git a/changelog.txt b/changelog.txt
index 88907a2..c9b751d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,13 @@
+0.6.0
+
+- Enabled support for Gradle 1.8
+- Gradle 1.8 is now the minimum supported version
+- Default encoding for compiling Java code is UTF-8
+- Users can now specify the encoding to use to compile Java code
+- Fixed Gradle 1.8-specific bugs
+  - Importing projects with missing dependencies was broken
+  - Compiling projects with AIDL files was broken
+
 0.5.7
 
 - Proguard support for libraries.
@@ -8,10 +18,9 @@
 - First lint integration. This is a work in progress and therefore the lint task is not added to the check task.
 - Enable compatibility with 1.8
 
-
 0.5.6
 
-- Enable support for 1.7
+- Enabled support for 1.7
 
 0.5.5
 
@@ -29,17 +38,17 @@
 
 0.5.3
 
-- Fix a crashing bug in PrepareDependenciesTask
+- Fixed a crashing bug in PrepareDependenciesTask
 
 0.5.2
 
 - Better error reporting for cmd line tools, especially
   if run in parallel in spawned threads
-- Fix an issue due to windows path in merged resource files.
+- Fixed an issue due to windows path in merged resource files.
 
 0.5.1
 
-- Fix issue in the dependency checker.
+- Fixed issue in the dependency checker.
 
 0.5.0:
 
@@ -58,10 +67,10 @@
 
 0.4.3:
 
-- enable crunching for all png files, not just .9.png
-- fix dealing with non resource files in res/ and assets/
-- fix crash when doing incremental aidl compilation due to broken method name (ah the joy of Groovy...)
-- clean older R classes when the app package name has changed.
+- Enabled crunching for all png files, not just .9.png
+- Fixed dealing with non resource files in res/ and assets/
+- Fixed crash when doing incremental aidl compilation due to broken method name (ah the joy of Groovy...)
+- Cleaned older R classes when the app package name has changed.
 
 0.4.2
 
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 fc8e00c..1d60c79 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 @@
 
 public class AndroidProjectTest extends TestCase {
 
-    private final static String MODEL_VERSION = "0.5.7-SNAPSHOT";
+    private final static String MODEL_VERSION = "0.6.0-SNAPSHOT";
 
     private static final Map<String, ProjectData> sProjectModelMap = Maps.newHashMap();
 
diff --git a/tests/3rdPartyTests/build.gradle b/tests/3rdPartyTests/build.gradle
index ce88c40..7c38050 100644
--- a/tests/3rdPartyTests/build.gradle
+++ b/tests/3rdPartyTests/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 a06635f..dd058e1 100644
--- a/tests/3rdPartyTests/buildSrc/build.gradle
+++ b/tests/3rdPartyTests/buildSrc/build.gradle
@@ -6,5 +6,5 @@
 }
 
 dependencies {
-    compile 'com.android.tools.build:builder-test-api:0.5.7-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 e2ba810..b22425e 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 ce88c40..7c38050 100644
--- a/tests/api/build.gradle
+++ b/tests/api/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index ce88c40..7c38050 100644
--- a/tests/applibtest/build.gradle
+++ b/tests/applibtest/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index 9571e88..14ae34b 100644
--- a/tests/assets/build.gradle
+++ b/tests/assets/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index ce88c40..7c38050 100644
--- a/tests/attrOrder/build.gradle
+++ b/tests/attrOrder/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/autorepo/build.gradle b/tests/autorepo/build.gradle
index b956e30..26f3cd5 100644
--- a/tests/autorepo/build.gradle
+++ b/tests/autorepo/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 2c43d84..3c830df 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 9413c25..4582635 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 0ad2778..fdbf591 100644
--- a/tests/dependencyChecker/build.gradle
+++ b/tests/dependencyChecker/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 afe312a..4c99423 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 9571e88..14ae34b 100644
--- a/tests/flavorlib/build.gradle
+++ b/tests/flavorlib/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index 9571e88..14ae34b 100644
--- a/tests/flavorlibWithFailedTests/build.gradle
+++ b/tests/flavorlibWithFailedTests/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index 009f590..0dbf29d 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 4a6e7d0..8b472b1 100644
--- a/tests/libProguard/build.gradle
+++ b/tests/libProguard/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardConsumerFiles/build.gradle b/tests/libProguardConsumerFiles/build.gradle
index d7b75f5..72e6f6b 100644
--- a/tests/libProguardConsumerFiles/build.gradle
+++ b/tests/libProguardConsumerFiles/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardJarDep/build.gradle b/tests/libProguardJarDep/build.gradle
index ce88c40..7c38050 100644
--- a/tests/libProguardJarDep/build.gradle
+++ b/tests/libProguardJarDep/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/libProguardLibDep/build.gradle b/tests/libProguardLibDep/build.gradle
index ce88c40..7c38050 100644
--- a/tests/libProguardLibDep/build.gradle
+++ b/tests/libProguardLibDep/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/libTestDep/build.gradle b/tests/libTestDep/build.gradle
index 2322033..655638a 100644
--- a/tests/libTestDep/build.gradle
+++ b/tests/libTestDep/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index 9571e88..14ae34b 100644
--- a/tests/libsTest/build.gradle
+++ b/tests/libsTest/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index 5309201..e940465 100644
--- a/tests/localJars/build.gradle
+++ b/tests/localJars/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 5474e0c..3948b71 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 5309201..e940465 100644
--- a/tests/multiproject/build.gradle
+++ b/tests/multiproject/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index e091eca..c059f4b 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 e6fc73d..d127d43 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index a66de8b..96f654e 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index 444b429..1996026 100644
--- a/tests/pkgOverride/build.gradle
+++ b/tests/pkgOverride/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 0294e3b..534e74c 100644
--- a/tests/proguard/build.gradle
+++ b/tests/proguard/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 ce88c40..7c38050 100644
--- a/tests/proguardLib/build.gradle
+++ b/tests/proguardLib/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/renamedApk/build.gradle b/tests/renamedApk/build.gradle
index 36e6c08..b16da8a 100644
--- a/tests/renamedApk/build.gradle
+++ b/tests/renamedApk/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 a4e22c7..2c4d3f0 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 ce88c40..7c38050 100644
--- a/tests/renderscriptInLib/build.gradle
+++ b/tests/renderscriptInLib/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 7a61ad3..3fa2f68 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 49c9a98..f20594a 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 16b92ed..4c95e77 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-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 6d1e08b..29250cf 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/sameNamedLibs/build.gradle b/tests/sameNamedLibs/build.gradle
index 9571e88..14ae34b 100644
--- a/tests/sameNamedLibs/build.gradle
+++ b/tests/sameNamedLibs/build.gradle
@@ -3,7 +3,7 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index ce88c40..7c38050 100644
--- a/tests/tictactoe/build.gradle
+++ b/tests/tictactoe/build.gradle
@@ -3,6 +3,6 @@
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.7-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.6.0-SNAPSHOT'
     }
 }