Merge "Update Gradle plugin to 1.0.1" into studio-1.0-dev automerge: ab724a0 automerge: ff3ef61

automerge: 84e78c5

* commit '84e78c58520346ba242d9ae20cbd151c5f614ad4':
  Update Gradle plugin to 1.0.1

85 files changed, 85 insertions, 85 deletions

diff --git a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
index cb20bdb5cb..b7ab8d585f 100644
--- a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
+++ b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
@@ -48,7 +48,7 @@ public class AndroidProjectTest extends TestCase {
     private static final String FOLDER_TEST_SAMPLE = "samples";
     private static final String FOLDER_TEST_PROJECT = "test-projects";
 
-    private static final String MODEL_VERSION = "1.0.0";
+    private static final String MODEL_VERSION = "1.0.1";
 
     private static final class ProjectData {
         AndroidProject model;
diff --git a/build-system/integration-test/samples/aidl/build.gradle b/build-system/integration-test/samples/aidl/build.gradle
index c0d21493d3..797d7b115a 100644
--- a/build-system/integration-test/samples/aidl/build.gradle
+++ b/build-system/integration-test/samples/aidl/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/androidManifestInTest/build.gradle b/build-system/integration-test/samples/androidManifestInTest/build.gradle
index 2db968c6a8..d801b3d9ce 100644
--- a/build-system/integration-test/samples/androidManifestInTest/build.gradle
+++ b/build-system/integration-test/samples/androidManifestInTest/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/api/build.gradle b/build-system/integration-test/samples/api/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/api/build.gradle
+++ b/build-system/integration-test/samples/api/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/applibtest/build.gradle b/build-system/integration-test/samples/applibtest/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/applibtest/build.gradle
+++ b/build-system/integration-test/samples/applibtest/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/assets/build.gradle b/build-system/integration-test/samples/assets/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/assets/build.gradle
+++ b/build-system/integration-test/samples/assets/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/attrOrder/build.gradle b/build-system/integration-test/samples/attrOrder/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/attrOrder/build.gradle
+++ b/build-system/integration-test/samples/attrOrder/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/basic/build.gradle b/build-system/integration-test/samples/basic/build.gradle
index 8f5b21f1cc..116292157f 100644
--- a/build-system/integration-test/samples/basic/build.gradle
+++ b/build-system/integration-test/samples/basic/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/combinedAbiDensityPureSplits/build.gradle b/build-system/integration-test/samples/combinedAbiDensityPureSplits/build.gradle
index 64fbf65693..8dc3d8c4a6 100644
--- a/build-system/integration-test/samples/combinedAbiDensityPureSplits/build.gradle
+++ b/build-system/integration-test/samples/combinedAbiDensityPureSplits/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/densitySplit/build.gradle b/build-system/integration-test/samples/densitySplit/build.gradle
index ad77990152..7dd051a823 100644
--- a/build-system/integration-test/samples/densitySplit/build.gradle
+++ b/build-system/integration-test/samples/densitySplit/build.gradle
@@ -5,7 +5,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/densitySplitInL/build.gradle b/build-system/integration-test/samples/densitySplitInL/build.gradle
index 0cf555c230..04f9e7a1bd 100644
--- a/build-system/integration-test/samples/densitySplitInL/build.gradle
+++ b/build-system/integration-test/samples/densitySplitInL/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/dependencies/build.gradle b/build-system/integration-test/samples/dependencies/build.gradle
index 2e7aea0db4..70beac0460 100644
--- a/build-system/integration-test/samples/dependencies/build.gradle
+++ b/build-system/integration-test/samples/dependencies/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/dependencyChecker/build.gradle b/build-system/integration-test/samples/dependencyChecker/build.gradle
index 592ec906ee..c7332bc23b 100644
--- a/build-system/integration-test/samples/dependencyChecker/build.gradle
+++ b/build-system/integration-test/samples/dependencyChecker/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/embedded/build.gradle b/build-system/integration-test/samples/embedded/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/embedded/build.gradle
+++ b/build-system/integration-test/samples/embedded/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/emptySplit/build.gradle b/build-system/integration-test/samples/emptySplit/build.gradle
index 5be3c51c7f..75313b2a32 100644
--- a/build-system/integration-test/samples/emptySplit/build.gradle
+++ b/build-system/integration-test/samples/emptySplit/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/extractAnnotations/build.gradle b/build-system/integration-test/samples/extractAnnotations/build.gradle
index 67129650df..2ccc20abb0 100644
--- a/build-system/integration-test/samples/extractAnnotations/build.gradle
+++ b/build-system/integration-test/samples/extractAnnotations/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/extractRsEnabledAnnotations/build.gradle b/build-system/integration-test/samples/extractRsEnabledAnnotations/build.gradle
index 01c2c71f37..ff9beb0e88 100644
--- a/build-system/integration-test/samples/extractRsEnabledAnnotations/build.gradle
+++ b/build-system/integration-test/samples/extractRsEnabledAnnotations/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/filteredOutBuildType/build.gradle b/build-system/integration-test/samples/filteredOutBuildType/build.gradle
index 1cd11ffd66..9b93683030 100644
--- a/build-system/integration-test/samples/filteredOutBuildType/build.gradle
+++ b/build-system/integration-test/samples/filteredOutBuildType/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/filteredOutVariants/build.gradle b/build-system/integration-test/samples/filteredOutVariants/build.gradle
index 97a4f25827..4ac19410dd 100644
--- a/build-system/integration-test/samples/filteredOutVariants/build.gradle
+++ b/build-system/integration-test/samples/filteredOutVariants/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/flavored/build.gradle b/build-system/integration-test/samples/flavored/build.gradle
index 7bd6a64ae1..f840380291 100644
--- a/build-system/integration-test/samples/flavored/build.gradle
+++ b/build-system/integration-test/samples/flavored/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/flavoredlib/build.gradle b/build-system/integration-test/samples/flavoredlib/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/flavoredlib/build.gradle
+++ b/build-system/integration-test/samples/flavoredlib/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/flavorlib/build.gradle b/build-system/integration-test/samples/flavorlib/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/flavorlib/build.gradle
+++ b/build-system/integration-test/samples/flavorlib/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/flavors/build.gradle b/build-system/integration-test/samples/flavors/build.gradle
index 89a9f16ce8..492ba64679 100644
--- a/build-system/integration-test/samples/flavors/build.gradle
+++ b/build-system/integration-test/samples/flavors/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/genFolderApi/build.gradle b/build-system/integration-test/samples/genFolderApi/build.gradle
index 6bc62d4dfc..597a216a9f 100644
--- a/build-system/integration-test/samples/genFolderApi/build.gradle
+++ b/build-system/integration-test/samples/genFolderApi/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libMinify/build.gradle b/build-system/integration-test/samples/libMinify/build.gradle
index 26c33271df..2b59ac69ef 100644
--- a/build-system/integration-test/samples/libMinify/build.gradle
+++ b/build-system/integration-test/samples/libMinify/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libMinifyJarDep/build.gradle b/build-system/integration-test/samples/libMinifyJarDep/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/libMinifyJarDep/build.gradle
+++ b/build-system/integration-test/samples/libMinifyJarDep/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libMinifyLibDep/build.gradle b/build-system/integration-test/samples/libMinifyLibDep/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/libMinifyLibDep/build.gradle
+++ b/build-system/integration-test/samples/libMinifyLibDep/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libProguardConsumerFiles/build.gradle b/build-system/integration-test/samples/libProguardConsumerFiles/build.gradle
index 051021cbb4..241636f53d 100644
--- a/build-system/integration-test/samples/libProguardConsumerFiles/build.gradle
+++ b/build-system/integration-test/samples/libProguardConsumerFiles/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libTestDep/build.gradle b/build-system/integration-test/samples/libTestDep/build.gradle
index 27dbb3f481..e175b1561b 100644
--- a/build-system/integration-test/samples/libTestDep/build.gradle
+++ b/build-system/integration-test/samples/libTestDep/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/libsTest/build.gradle b/build-system/integration-test/samples/libsTest/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/libsTest/build.gradle
+++ b/build-system/integration-test/samples/libsTest/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/localAarTest/build.gradle b/build-system/integration-test/samples/localAarTest/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/localAarTest/build.gradle
+++ b/build-system/integration-test/samples/localAarTest/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/localJars/build.gradle b/build-system/integration-test/samples/localJars/build.gradle
index 7e29cec284..587cacf8c2 100644
--- a/build-system/integration-test/samples/localJars/build.gradle
+++ b/build-system/integration-test/samples/localJars/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/maxSdkVersion/build.gradle b/build-system/integration-test/samples/maxSdkVersion/build.gradle
index f98c143e08..d346195ecb 100644
--- a/build-system/integration-test/samples/maxSdkVersion/build.gradle
+++ b/build-system/integration-test/samples/maxSdkVersion/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/migrated/build.gradle b/build-system/integration-test/samples/migrated/build.gradle
index 11977afed1..3528febd31 100644
--- a/build-system/integration-test/samples/migrated/build.gradle
+++ b/build-system/integration-test/samples/migrated/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/minify/build.gradle b/build-system/integration-test/samples/minify/build.gradle
index 1949bba67c..9cf95d93c6 100644
--- a/build-system/integration-test/samples/minify/build.gradle
+++ b/build-system/integration-test/samples/minify/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/minifyLib/build.gradle b/build-system/integration-test/samples/minifyLib/build.gradle
index bf7bea6a21..6c78a4a069 100644
--- a/build-system/integration-test/samples/minifyLib/build.gradle
+++ b/build-system/integration-test/samples/minifyLib/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/multiDex/build.gradle b/build-system/integration-test/samples/multiDex/build.gradle
index 4a284e1f29..abaafdacbe 100644
--- a/build-system/integration-test/samples/multiDex/build.gradle
+++ b/build-system/integration-test/samples/multiDex/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/multiDexWithLib/build.gradle b/build-system/integration-test/samples/multiDexWithLib/build.gradle
index 47b243d84f..1220945082 100644
--- a/build-system/integration-test/samples/multiDexWithLib/build.gradle
+++ b/build-system/integration-test/samples/multiDexWithLib/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/multiproject/build.gradle b/build-system/integration-test/samples/multiproject/build.gradle
index 7e29cec284..587cacf8c2 100644
--- a/build-system/integration-test/samples/multiproject/build.gradle
+++ b/build-system/integration-test/samples/multiproject/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/multires/build.gradle b/build-system/integration-test/samples/multires/build.gradle
index 9bf6402cc3..25c707cdff 100644
--- a/build-system/integration-test/samples/multires/build.gradle
+++ b/build-system/integration-test/samples/multires/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkJniLib/build.gradle b/build-system/integration-test/samples/ndkJniLib/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/ndkJniLib/build.gradle
+++ b/build-system/integration-test/samples/ndkJniLib/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkJniLib2/build.gradle b/build-system/integration-test/samples/ndkJniLib2/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/ndkJniLib2/build.gradle
+++ b/build-system/integration-test/samples/ndkJniLib2/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkJniPureSplitLib/build.gradle b/build-system/integration-test/samples/ndkJniPureSplitLib/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/ndkJniPureSplitLib/build.gradle
+++ b/build-system/integration-test/samples/ndkJniPureSplitLib/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkLibPrebuilts/build.gradle b/build-system/integration-test/samples/ndkLibPrebuilts/build.gradle
index bd040f3bbd..4ecefa5762 100644
--- a/build-system/integration-test/samples/ndkLibPrebuilts/build.gradle
+++ b/build-system/integration-test/samples/ndkLibPrebuilts/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkPrebuilts/build.gradle b/build-system/integration-test/samples/ndkPrebuilts/build.gradle
index dbec55f2c6..905cc15c4e 100644
--- a/build-system/integration-test/samples/ndkPrebuilts/build.gradle
+++ b/build-system/integration-test/samples/ndkPrebuilts/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkRsHelloCompute/build.gradle b/build-system/integration-test/samples/ndkRsHelloCompute/build.gradle
index 5e208bab14..2db4231626 100644
--- a/build-system/integration-test/samples/ndkRsHelloCompute/build.gradle
+++ b/build-system/integration-test/samples/ndkRsHelloCompute/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkSanAngeles/build.gradle b/build-system/integration-test/samples/ndkSanAngeles/build.gradle
index e985e74b1d..1e2bdc26e3 100644
--- a/build-system/integration-test/samples/ndkSanAngeles/build.gradle
+++ b/build-system/integration-test/samples/ndkSanAngeles/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkSanAngeles2/build.gradle b/build-system/integration-test/samples/ndkSanAngeles2/build.gradle
index 2377ebac16..9d833a3f37 100644
--- a/build-system/integration-test/samples/ndkSanAngeles2/build.gradle
+++ b/build-system/integration-test/samples/ndkSanAngeles2/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkStandaloneSo/build.gradle b/build-system/integration-test/samples/ndkStandaloneSo/build.gradle
index c114d077e3..8a61676c2d 100644
--- a/build-system/integration-test/samples/ndkStandaloneSo/build.gradle
+++ b/build-system/integration-test/samples/ndkStandaloneSo/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/ndkVariants/build.gradle b/build-system/integration-test/samples/ndkVariants/build.gradle
index 30a75f545e..8e6a01b82f 100644
--- a/build-system/integration-test/samples/ndkVariants/build.gradle
+++ b/build-system/integration-test/samples/ndkVariants/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/noPreDex/build.gradle b/build-system/integration-test/samples/noPreDex/build.gradle
index 959e752bcf..db36849302 100644
--- a/build-system/integration-test/samples/noPreDex/build.gradle
+++ b/build-system/integration-test/samples/noPreDex/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/overlay1/build.gradle b/build-system/integration-test/samples/overlay1/build.gradle
index 9f9a15e6e7..be27d246c8 100644
--- a/build-system/integration-test/samples/overlay1/build.gradle
+++ b/build-system/integration-test/samples/overlay1/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/overlay2/build.gradle b/build-system/integration-test/samples/overlay2/build.gradle
index 4cbff21904..e0c0f81bd9 100644
--- a/build-system/integration-test/samples/overlay2/build.gradle
+++ b/build-system/integration-test/samples/overlay2/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/overlay3/build.gradle b/build-system/integration-test/samples/overlay3/build.gradle
index 86f7d16334..e12f911900 100644
--- a/build-system/integration-test/samples/overlay3/build.gradle
+++ b/build-system/integration-test/samples/overlay3/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/packagingOptions/build.gradle b/build-system/integration-test/samples/packagingOptions/build.gradle
index 7cdd970884..54749a4a4a 100644
--- a/build-system/integration-test/samples/packagingOptions/build.gradle
+++ b/build-system/integration-test/samples/packagingOptions/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/pkgOverride/build.gradle b/build-system/integration-test/samples/pkgOverride/build.gradle
index 173f6e29a7..0e3091ad4f 100644
--- a/build-system/integration-test/samples/pkgOverride/build.gradle
+++ b/build-system/integration-test/samples/pkgOverride/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/pseudolocalized/build.gradle b/build-system/integration-test/samples/pseudolocalized/build.gradle
index 663e447443..eb1b8ae4c1 100644
--- a/build-system/integration-test/samples/pseudolocalized/build.gradle
+++ b/build-system/integration-test/samples/pseudolocalized/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
     repositories {
         if (System.env.CUSTOM_REPO != null) {
             maven { url System.env.CUSTOM_REPO }
diff --git a/build-system/integration-test/samples/renamedApk/build.gradle b/build-system/integration-test/samples/renamedApk/build.gradle
index 36ec347579..cd5eb1725e 100644
--- a/build-system/integration-test/samples/renamedApk/build.gradle
+++ b/build-system/integration-test/samples/renamedApk/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/renderscript/build.gradle b/build-system/integration-test/samples/renderscript/build.gradle
index 5a922c7821..21fcca620d 100644
--- a/build-system/integration-test/samples/renderscript/build.gradle
+++ b/build-system/integration-test/samples/renderscript/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/renderscriptInLib/build.gradle b/build-system/integration-test/samples/renderscriptInLib/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/renderscriptInLib/build.gradle
+++ b/build-system/integration-test/samples/renderscriptInLib/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/renderscriptMultiSrc/build.gradle b/build-system/integration-test/samples/renderscriptMultiSrc/build.gradle
index b23de6de19..2c93e75540 100644
--- a/build-system/integration-test/samples/renderscriptMultiSrc/build.gradle
+++ b/build-system/integration-test/samples/renderscriptMultiSrc/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/rsSupportMode/build.gradle b/build-system/integration-test/samples/rsSupportMode/build.gradle
index bcd80e086a..86e393a5cb 100644
--- a/build-system/integration-test/samples/rsSupportMode/build.gradle
+++ b/build-system/integration-test/samples/rsSupportMode/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/sameNamedLibs/build.gradle b/build-system/integration-test/samples/sameNamedLibs/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/samples/sameNamedLibs/build.gradle
+++ b/build-system/integration-test/samples/sameNamedLibs/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/testWithDep/build.gradle b/build-system/integration-test/samples/testWithDep/build.gradle
index 58c945117e..ce12f7fb60 100644
--- a/build-system/integration-test/samples/testWithDep/build.gradle
+++ b/build-system/integration-test/samples/testWithDep/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/samples/tictactoe/build.gradle b/build-system/integration-test/samples/tictactoe/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/samples/tictactoe/build.gradle
+++ b/build-system/integration-test/samples/tictactoe/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/src/test/groovy/com/android/build/gradle/integration/common/fixture/GradleTestProject.java b/build-system/integration-test/src/test/groovy/com/android/build/gradle/integration/common/fixture/GradleTestProject.java
index a86a36c624..cc3af689db 100644
--- a/build-system/integration-test/src/test/groovy/com/android/build/gradle/integration/common/fixture/GradleTestProject.java
+++ b/build-system/integration-test/src/test/groovy/com/android/build/gradle/integration/common/fixture/GradleTestProject.java
@@ -75,7 +75,7 @@ public class GradleTestProject implements TestRule {
 
     public static final String DEFAULT_BUILD_TOOL_VERSION = "21.0.1";
 
-    private static final String ANDROID_GRADLE_VERSION = "1.0.0";
+    private static final String ANDROID_GRADLE_VERSION = "1.0.1";
 
     public static class Builder {
         private static final File SAMPLE_PROJECT_DIR = new File("samples");
diff --git a/build-system/integration-test/test-projects/3rdPartyTests/build.gradle b/build-system/integration-test/test-projects/3rdPartyTests/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/test-projects/3rdPartyTests/build.gradle
+++ b/build-system/integration-test/test-projects/3rdPartyTests/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle b/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
index 1b34ae021e..d867b7e82d 100644
--- a/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
+++ b/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
@@ -10,5 +10,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.tools.build:builder-test-api:1.0.0'
+    compile 'com.android.tools.build:builder-test-api:1.0.1'
 }
\ No newline at end of file
diff --git a/build-system/integration-test/test-projects/artifactApi/build.gradle b/build-system/integration-test/test-projects/artifactApi/build.gradle
index 5e9ffe6953..f15e2763f0 100644
--- a/build-system/integration-test/test-projects/artifactApi/build.gradle
+++ b/build-system/integration-test/test-projects/artifactApi/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/basicMultiFlavors/build.gradle b/build-system/integration-test/test-projects/basicMultiFlavors/build.gradle
index 1abfb7b1bc..b98fdef5ee 100644
--- a/build-system/integration-test/test-projects/basicMultiFlavors/build.gradle
+++ b/build-system/integration-test/test-projects/basicMultiFlavors/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/customArtifactDep/build.gradle b/build-system/integration-test/test-projects/customArtifactDep/build.gradle
index bfb133eca2..304d7ad14f 100644
--- a/build-system/integration-test/test-projects/customArtifactDep/build.gradle
+++ b/build-system/integration-test/test-projects/customArtifactDep/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/customSigning/build.gradle b/build-system/integration-test/test-projects/customSigning/build.gradle
index 72583d1fee..d2b665869f 100644
--- a/build-system/integration-test/test-projects/customSigning/build.gradle
+++ b/build-system/integration-test/test-projects/customSigning/build.gradle
@@ -4,7 +4,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/dependenciesWithVariants/build.gradle b/build-system/integration-test/test-projects/dependenciesWithVariants/build.gradle
index 338924671f..50f0a47232 100644
--- a/build-system/integration-test/test-projects/dependenciesWithVariants/build.gradle
+++ b/build-system/integration-test/test-projects/dependenciesWithVariants/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/flavorlibWithFailedTests/build.gradle b/build-system/integration-test/test-projects/flavorlibWithFailedTests/build.gradle
index f3e4708d07..9c89be4849 100644
--- a/build-system/integration-test/test-projects/flavorlibWithFailedTests/build.gradle
+++ b/build-system/integration-test/test-projects/flavorlibWithFailedTests/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/genFolderApi2/build.gradle b/build-system/integration-test/test-projects/genFolderApi2/build.gradle
index 832c2ff9a3..6dc504a009 100644
--- a/build-system/integration-test/test-projects/genFolderApi2/build.gradle
+++ b/build-system/integration-test/test-projects/genFolderApi2/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/invalidDependencyOnAppProject/build.gradle b/build-system/integration-test/test-projects/invalidDependencyOnAppProject/build.gradle
index 4f25bcd0c3..3d99673115 100644
--- a/build-system/integration-test/test-projects/invalidDependencyOnAppProject/build.gradle
+++ b/build-system/integration-test/test-projects/invalidDependencyOnAppProject/build.gradle
@@ -19,7 +19,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/mavenLocal/app/build.gradle b/build-system/integration-test/test-projects/mavenLocal/app/build.gradle
index 2a665e38bb..506fda538d 100644
--- a/build-system/integration-test/test-projects/mavenLocal/app/build.gradle
+++ b/build-system/integration-test/test-projects/mavenLocal/app/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/mavenLocal/baseLibrary/build.gradle b/build-system/integration-test/test-projects/mavenLocal/baseLibrary/build.gradle
index aeb5e0d965..9349f16c6b 100644
--- a/build-system/integration-test/test-projects/mavenLocal/baseLibrary/build.gradle
+++ b/build-system/integration-test/test-projects/mavenLocal/baseLibrary/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/mavenLocal/library/build.gradle b/build-system/integration-test/test-projects/mavenLocal/library/build.gradle
index 3f94b92133..c69a168612 100644
--- a/build-system/integration-test/test-projects/mavenLocal/library/build.gradle
+++ b/build-system/integration-test/test-projects/mavenLocal/library/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/parentLibsTest/app/build.gradle b/build-system/integration-test/test-projects/parentLibsTest/app/build.gradle
index 09c62e4593..cee009515d 100644
--- a/build-system/integration-test/test-projects/parentLibsTest/app/build.gradle
+++ b/build-system/integration-test/test-projects/parentLibsTest/app/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/repo/app/build.gradle b/build-system/integration-test/test-projects/repo/app/build.gradle
index 044ab99d8b..7c16f55438 100644
--- a/build-system/integration-test/test-projects/repo/app/build.gradle
+++ b/build-system/integration-test/test-projects/repo/app/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/repo/baseLibrary/build.gradle b/build-system/integration-test/test-projects/repo/baseLibrary/build.gradle
index fcccff9f25..be639480a5 100644
--- a/build-system/integration-test/test-projects/repo/baseLibrary/build.gradle
+++ b/build-system/integration-test/test-projects/repo/baseLibrary/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/repo/library/build.gradle b/build-system/integration-test/test-projects/repo/library/build.gradle
index 05d570e612..de4f0d539c 100644
--- a/build-system/integration-test/test-projects/repo/library/build.gradle
+++ b/build-system/integration-test/test-projects/repo/library/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/shrink/build.gradle b/build-system/integration-test/test-projects/shrink/build.gradle
index 92ccaccbb0..e0653d8282 100644
--- a/build-system/integration-test/test-projects/shrink/build.gradle
+++ b/build-system/integration-test/test-projects/shrink/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {
diff --git a/build-system/integration-test/test-projects/simpleManifestMergingTask/build.gradle b/build-system/integration-test/test-projects/simpleManifestMergingTask/build.gradle
index bffbb36d4a..62da95a994 100644
--- a/build-system/integration-test/test-projects/simpleManifestMergingTask/build.gradle
+++ b/build-system/integration-test/test-projects/simpleManifestMergingTask/build.gradle
@@ -3,7 +3,7 @@ ext {
 }
 
 buildscript {
-    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.0'
+    def gradleVersion = System.env.CUSTOM_GRADLE != null ? System.env.CUSTOM_GRADLE : '1.0.1'
 
     repositories {
         if (System.env.CUSTOM_REPO != null) {