honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jason Tedor 2017-12-20 16:14:19 -05:00 committed by GitHub
parent 47eefbe889
commit c8371fa0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -126,7 +126,7 @@ class BuildPlugin implements Plugin<Project> {
// enforce Gradle version
final GradleVersion currentGradleVersion = GradleVersion.current();
final GradleVersion minGradle = GradleVersion.version('3.3')
final GradleVersion minGradle = GradleVersion.version('4.3')
if (currentGradleVersion < minGradle) {
throw new GradleException("${minGradle} or above is required to build elasticsearch")
}
@ -444,13 +444,6 @@ class BuildPlugin implements Plugin<Project> {
// 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
}
}
}
}
}