From 882633fb97f47858d006ac52cc518a836f63cf1b Mon Sep 17 00:00:00 2001 From: David Pilato Date: Fri, 3 Nov 2017 14:36:59 +0100 Subject: [PATCH] Add support for Gradle 4.3 (#27249) Closes #26840 Related to #27087 Backport of #27249 in 6.x branch --- .../groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 67ebfd5c9bb2c..159f84258df28 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -131,9 +131,10 @@ class BuildPlugin implements Plugin { throw new GradleException("${minGradle} or above is required to build elasticsearch") } - final GradleVersion maxGradle = GradleVersion.version('4.2') - if (currentGradleVersion >= maxGradle) { - throw new GradleException("${maxGradle} or above is not compatible with the elasticsearch build") + final GradleVersion gradle42 = GradleVersion.version('4.2') + final GradleVersion gradle43 = GradleVersion.version('4.3') + if (currentGradleVersion >= gradle42 && currentGradleVersion < gradle43) { + throw new GradleException("${currentGradleVersion} is not compatible with the elasticsearch build") } // enforce Java version