diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-06-18 21:16:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-18 21:16:08 +0000 |
| commit | e28a7ad1c3d876eb11aa64ed51d0927b1e73e1a6 (patch) | |
| tree | 7831cf485d568cf7ae9e764706b9fc703f0d8dac | |
| parent | 7fd05fd6d1001864c287de2a15644d0e0a1a1eb8 (diff) | |
| parent | aa216180e1e7dec45c080529a2e1dffa44d099c5 (diff) | |
| download | base-studio-1.2-dev.tar.gz | |
Merge "Fix tests to run with 1.2.4. DO NOT MERGE." into studio-1.2-devstudio-1.2-dev
3 files changed, 3 insertions, 3 deletions
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 a27ba2ecd8..cc5bfbfbb7 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 class GradleTestProject implements TestRule { 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.3"; + private static final String ANDROID_GRADLE_VERSION = "1.2.4"; 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/commonBuildScript.gradle b/build-system/integration-test/test-projects/commonBuildScript.gradle index f8a97e0bd9..265c9c38da 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.3' +def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.4' 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 952f444c4b..e999773da7 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.3' +def gradleVersion = System.env.CUSTOM_GRADLE ?: '1.2.4' apply from: "commonLocalRepo.gradle" |