Update version to 0.7.0

Change-Id: Ie2de7ec0fd043218a3018859e65e69246515424d

43 files changed, 47 insertions, 42 deletions

diff --git a/build.gradle b/build.gradle
index 334a7d5..b440c7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
     }
 
     project.ext {
-        baseVersion = '0.6.2'
+        baseVersion = '0.7.0'
     }
 
     task disableTestFailures << {
diff --git a/changelog.txt b/changelog.txt
index ad787f2..e8d0b4a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+0.7.0
+- Switch to ProGuard 4.10
+- Jar files are now pre-dexed for faster dexing.
+- First pass at NDK integration
+
 0.6.3
 - Fixed ClassNotFoundException:MergingException introduced in 0.6.2
 
diff --git a/tests/3rdPartyTests/build.gradle b/tests/3rdPartyTests/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/3rdPartyTests/buildSrc/build.gradle b/tests/3rdPartyTests/buildSrc/build.gradle
index 6c0d29a..8e1c757 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.2-SNAPSHOT'
+    compile 'com.android.tools.build:builder-test-api:0.7.0-SNAPSHOT'
 }
\ No newline at end of file
diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index df53f7f..daacecc 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/api/build.gradle b/tests/api/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index 4fbde6a..ef3d0aa 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/autorepo/build.gradle b/tests/autorepo/build.gradle
index 313156c..d10badb 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 0a0bfdd..b020f58 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 7a8f9ef..a7810ac 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/dependencyChecker/build.gradle b/tests/dependencyChecker/build.gradle
index 7b84b2b..771fa54 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index 8f1dfdd..61f0cea 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index 4fbde6a..ef3d0aa 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index 4fbde6a..ef3d0aa 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index a095403..d3f5940 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/libProguard/build.gradle b/tests/libProguard/build.gradle
index 92e0397..9df86e6 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardConsumerFiles/build.gradle b/tests/libProguardConsumerFiles/build.gradle
index b0dddb9..55453e0 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libProguardJarDep/build.gradle b/tests/libProguardJarDep/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/libProguardLibDep/build.gradle b/tests/libProguardLibDep/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/libTestDep/build.gradle b/tests/libTestDep/build.gradle
index b26298e..e63fc62 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index 4fbde6a..ef3d0aa 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index 6849244..d887778 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index d76a9ad..e43334e 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/multiproject/build.gradle b/tests/multiproject/build.gradle
index 6849244..d887778 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index f2452c3..5043daf 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/ndkSanAngeles/build.gradle b/tests/ndkSanAngeles/build.gradle
index 6f28e85..6080ff8 100644
--- a/tests/ndkSanAngeles/build.gradle
+++ b/tests/ndkSanAngeles/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 5e62544..5d126e1 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index 83413a1..845610c 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index a7e3285..72b1dc4 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
index 5c6117e..655605d 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/proguardLib/build.gradle b/tests/proguardLib/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/renamedApk/build.gradle b/tests/renamedApk/build.gradle
index 8742f7f..0323afe 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index 7e8b430..93e17af 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/renderscriptInLib/build.gradle b/tests/renderscriptInLib/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 43e341b..3a3b9f6 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index 3dd0d42..29512f3 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index 37a3bf0..1f5dbe6 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index ce5d2b7..2d1ccd5 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/rsSupportMode/build.gradle b/tests/rsSupportMode/build.gradle
index aa5f833..86d1f22 100644
--- a/tests/rsSupportMode/build.gradle
+++ b/tests/rsSupportMode/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         maven { url '../../../../out/host/gradle/repo' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 apply plugin: 'android'
diff --git a/tests/sameNamedLibs/build.gradle b/tests/sameNamedLibs/build.gradle
index 4fbde6a..ef3d0aa 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }
 
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index 365b54a..b899f9a 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.2-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:0.7.0-SNAPSHOT'
     }
 }