GEODE-1259: Upgrade gradle version to 2.12 This also addresses GEODE-1085 and GEODE-1261
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8e744982 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8e744982 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8e744982 Branch: refs/heads/feature/GEODE-1276 Commit: 8e744982a1cc5da50d4eb5640a2dae8ed87dfd24 Parents: 152ef59 Author: Jason Huynh <huyn...@gmail.com> Authored: Mon Apr 25 11:00:16 2016 -0700 Committer: Jason Huynh <huyn...@gmail.com> Committed: Mon May 2 10:33:49 2016 -0700 ---------------------------------------------------------------------- BUILDING.md | 2 +- build.gradle | 4 ++++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 53637 -> 53639 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/BUILDING.md ---------------------------------------------------------------------- diff --git a/BUILDING.md b/BUILDING.md index ababe2b..f2eeb62 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -39,7 +39,7 @@ or the `gfsh` script can be found in ``` $ set JAVA_HOME="C:\Program Files\Java\jdk1.8.0_60" ``` -2. Install Gradle, version 2.3 or a more recent version. +2. Install Gradle, version 2.12 or a more recent version. 3. Download the project source from the Releases page at [Apache Geode (incubating)] (http://geode.incubator.apache.org), and unpack the source code. 4. Within the folder containing the unpacked source code, build without the tests: http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 4f79eae..9a3ff10 100755 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,10 @@ buildscript { apply plugin: 'wrapper' +wrapper { + gradleVersion = minimumGradleVersion +} + // Load all properties in dependency-version.properties as project properties, so all projects can read them Properties dependencyVersions = new Properties() dependencyVersions.load(new FileInputStream("${project.projectDir}/gradle/dependency-versions.properties")) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index 669baed..ad39dc6 100755 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,7 @@ releaseType = .M3-SNAPSHOT org.gradle.daemon = true org.gradle.jvmargs = -Xmx2048m +minimumGradleVersion = 2.12 # Set this on the command line with -P or in ~/.gradle/gradle.properties # to change the buildDir location. Use an absolute path. buildRoot= http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 05ef575..2c6137b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b0d17a..72f7318 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8e744982/settings.gradle ---------------------------------------------------------------------- diff --git a/settings.gradle b/settings.gradle index c579dce..188faa4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,7 +35,6 @@ include 'extensions/geode-modules-hibernate' include 'extensions/geode-modules-session' include 'extensions/geode-modules-assembly' -def minimumGradleVersion = '2.3' if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) { throw new GradleException('Running with unsupported Gradle Version. Use Gradle Wrapper or with Gradle version >= ' + minimumGradleVersion) }
