From d64d1c99d4c04466f2e5b101ca3ae83c69502ca3 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 10 Nov 2015 11:17:30 -0800
Subject: [PATCH] Build: Upgrade minimum gradle version to 2.8

In gradle 2.7 (or groovy 2.3.10, not sure which), there appears to be a
bug on linux where using a fully qualified class (without an import
statement) does not work. This change forces gradle 2.8 or above. It
also moves the logic around a little for the version check so the build
info is printed before checks against that info.
---
 .../elasticsearch/gradle/BuildPlugin.groovy   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
index 1b3e537f102..df6c31e833f 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -27,6 +27,7 @@ import org.gradle.api.Task
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.util.GradleVersion
 import org.gradle.util.VersionNumber
 
 /**
@@ -56,17 +57,6 @@ class BuildPlugin implements Plugin<Project> {
 
     static void globalBuildInfo(Project project) {
         if (project.rootProject.ext.has('buildChecksDone') == false) {
-            // enforce gradle version
-            VersionNumber gradleVersion = VersionNumber.parse(project.gradle.gradleVersion)
-            if (gradleVersion.major < 2 || gradleVersion.major == 2 && gradleVersion.minor < 6) {
-                throw new GradleException('Gradle 2.6 or above is required to build elasticsearch')
-            }
-
-            // enforce Java version
-            if (!JavaVersion.current().isJava8Compatible()) {
-                throw new GradleException('Java 8 or above is required to build Elasticsearch')
-            }
-
             // Build debugging info
             println '======================================='
             println 'Elasticsearch Build Hamster says Hello!'
@@ -74,6 +64,18 @@ class BuildPlugin implements Plugin<Project> {
             println "  Gradle Version : ${project.gradle.gradleVersion}"
             println "  JDK Version    : ${System.getProperty('java.runtime.version')} (${System.getProperty('java.vendor')})"
             println "  OS Info        : ${System.getProperty('os.name')} ${System.getProperty('os.version')} (${System.getProperty('os.arch')})"
+
+            // enforce gradle version
+            GradleVersion minGradle = GradleVersion.version('2.8')
+            if (GradleVersion.current() < minGradle) {
+                throw new GradleException("${minGradle} or above is required to build elasticsearch")
+            }
+
+            // enforce Java version
+            if (!JavaVersion.current().isJava8Compatible()) {
+                throw new GradleException('Java 8 or above is required to build Elasticsearch')
+            }
+
             project.rootProject.ext.buildChecksDone = true
         }
     }