Add support for Gradle 4.3 (#27249)

dadoonet · dadoonet · commit 95defa50ddc8 · 2017-11-03T14:45:13.000+01:00
Closes #26840 Related to #27087 Backport of #27249 in 5.6 branch
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -130,9 +130,10 @@ class BuildPlugin implements Plugin<Project> {
                 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

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,10 @@ class BuildPlugin implements Plugin<Project> {`
`130`	`130`	`throw new GradleException("${minGradle} or above is required to build elasticsearch")`
`131`	`131`	`}`
`132`	`132`
`133`		`- final GradleVersion maxGradle = GradleVersion.version('4.2')`
`134`		`- if (currentGradleVersion >= maxGradle) {`
`135`		`- throw new GradleException("${maxGradle} or above is not compatible with the elasticsearch build")`
	`133`	`+ final GradleVersion gradle42 = GradleVersion.version('4.2')`
	`134`	`+ final GradleVersion gradle43 = GradleVersion.version('4.3')`
	`135`	`+ if (currentGradleVersion >= gradle42 && currentGradleVersion < gradle43) {`
	`136`	`+ throw new GradleException("${currentGradleVersion} is not compatible with the elasticsearch build")`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`// enforce Java version`