| commit | 00bf2b36112615453d514d2b7f558a032b5be211 | [log] [tgz] |
|---|---|---|
| author | Jerome Dochez <jedo@google.com> | Mon May 04 17:03:35 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon May 04 17:03:36 2015 +0000 |
| tree | 150c4e4ec3665af7e9370ca75afb526eeac2fcf2 | |
| parent | 8dc596c8bb1163185d071ecc5045c5f9c9e61b3c [diff] | |
| parent | 739c9ea59f7532e2983257c29e4728b73f090da4 [diff] |
Merge "DO NOT MERGE bumped up to 1.2.3" into studio-1.2-release
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 50398d4..a27ba2e 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
@@ -85,7 +85,7 @@ public static final String GRADLE_TEST_VERSION = "2.2.1"; public static final String GRADLE_EXP_TEST_VERSION = "2.4-20150121230028+0000"; - private static final String ANDROID_GRADLE_VERSION = "1.2.2"; + private static final String ANDROID_GRADLE_VERSION = "1.2.3"; private static final String COMMON_HEADER = "commonHeader.gradle"; private static final String COMMON_LOCAL_REPO = "commonLocalRepo.gradle"; private static final String COMMON_BUILD_SCRIPT = "commonBuildScript.gradle";
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 3262f44..9a7cb50 100644 --- a/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle +++ b/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
@@ -4,5 +4,5 @@ apply from: "../../commonLocalRepo.gradle" dependencies { - compile 'com.android.tools.build:builder-test-api:1.2.2' + compile 'com.android.tools.build:builder-test-api:1.2.3' } \ No newline at end of file
diff --git a/build-system/integration-test/test-projects/commonBuildScript.gradle b/build-system/integration-test/test-projects/commonBuildScript.gradle index d61d504..f8a97e0 100644 --- a/build-system/integration-test/test-projects/commonBuildScript.gradle +++ b/build-system/integration-test/test-projects/commonBuildScript.gradle
@@ -14,7 +14,7 @@ * limitations under the License. */ -def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.2' +def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.3' apply from: "commonLocalRepo.gradle"
diff --git a/build-system/integration-test/test-projects/commonBuildScriptExperimental.gradle b/build-system/integration-test/test-projects/commonBuildScriptExperimental.gradle index b8d7680..952f444 100644 --- a/build-system/integration-test/test-projects/commonBuildScriptExperimental.gradle +++ b/build-system/integration-test/test-projects/commonBuildScriptExperimental.gradle
@@ -14,7 +14,7 @@ * limitations under the License. */ -def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.2' +def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.3' apply from: "commonLocalRepo.gradle"