Skip to content

Commit 2ca00ee

Browse files
committed
Require Gradle 4.3
This commit sets the minimum Gradle version to version 4.3. This the minimum Gradle version that understands JDK 10 in code. Relates #27885
1 parent 8fdf225 commit 2ca00ee

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class BuildPlugin implements Plugin<Project> {
125125
// enforce Gradle version
126126
final GradleVersion currentGradleVersion = GradleVersion.current();
127127

128-
final GradleVersion minGradle = GradleVersion.version('3.3')
128+
final GradleVersion minGradle = GradleVersion.version('4.3')
129129
if (currentGradleVersion < minGradle) {
130130
throw new GradleException("${minGradle} or above is required to build elasticsearch")
131131
}
@@ -443,13 +443,6 @@ class BuildPlugin implements Plugin<Project> {
443443
// hack until gradle supports java 9's new "--release" arg
444444
assert minimumJava == JavaVersion.VERSION_1_8
445445
options.compilerArgs << '--release' << '8'
446-
if (GradleVersion.current().getBaseVersion() < GradleVersion.version("4.1")) {
447-
// this hack is not needed anymore since Gradle 4.1, see https://github.com/gradle/gradle/pull/2474
448-
doFirst {
449-
sourceCompatibility = null
450-
targetCompatibility = null
451-
}
452-
}
453446
}
454447
}
455448
}

0 commit comments

Comments
 (0)