From 2315952e38d0ef14a7e7ea34126517468db0ce28 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 18 Dec 2017 21:35:31 -0500 Subject: [PATCH 1/3] Require Gradle 4.1 This commit sets the minimum Gradle version to version 4.1. This the minimum Gradle version that understands JDK 10 in code. --- .../groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index c1669c0a72ae2..fda4a41be9f84 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -126,7 +126,7 @@ class BuildPlugin implements Plugin { // enforce Gradle version final GradleVersion currentGradleVersion = GradleVersion.current(); - final GradleVersion minGradle = GradleVersion.version('3.3') + final GradleVersion minGradle = GradleVersion.version('4.1') if (currentGradleVersion < minGradle) { throw new GradleException("${minGradle} or above is required to build elasticsearch") } @@ -444,13 +444,6 @@ class BuildPlugin implements Plugin { // hack until gradle supports java 9's new "--release" arg assert minimumJava == JavaVersion.VERSION_1_8 options.compilerArgs << '--release' << '8' - if (GradleVersion.current().getBaseVersion() < GradleVersion.version("4.1")) { - // this hack is not needed anymore since Gradle 4.1, see https://github.com/gradle/gradle/pull/2474 - doFirst { - sourceCompatibility = null - targetCompatibility = null - } - } } } } From fe0d2c9d9cccab7664b5dff94e366b632a84b146 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 19 Dec 2017 00:36:02 -0500 Subject: [PATCH 2/3] Require Gradle 4.4 --- .../src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index fda4a41be9f84..45086d7dfa9e9 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -126,7 +126,7 @@ class BuildPlugin implements Plugin { // enforce Gradle version final GradleVersion currentGradleVersion = GradleVersion.current(); - final GradleVersion minGradle = GradleVersion.version('4.1') + final GradleVersion minGradle = GradleVersion.version('4.4') if (currentGradleVersion < minGradle) { throw new GradleException("${minGradle} or above is required to build elasticsearch") } From 70e6c19ba403a571346c8e131dca26b3e80520ff Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 20 Dec 2017 16:12:24 -0500 Subject: [PATCH 3/3] Version 4.3 for now --- .../src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 45086d7dfa9e9..46b338c08eab2 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -126,7 +126,7 @@ class BuildPlugin implements Plugin { // enforce Gradle version final GradleVersion currentGradleVersion = GradleVersion.current(); - final GradleVersion minGradle = GradleVersion.version('4.4') + final GradleVersion minGradle = GradleVersion.version('4.3') if (currentGradleVersion < minGradle) { throw new GradleException("${minGradle} or above is required to build elasticsearch") }