Skip to content

Commit c8371fa

Browse files
authored
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 47eefbe commit c8371fa

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
@@ -126,7 +126,7 @@ class BuildPlugin implements Plugin<Project> {
126126
// enforce Gradle version
127127
final GradleVersion currentGradleVersion = GradleVersion.current();
128128

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

0 commit comments

Comments
 (0)