honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use full profile on JDK 10 builds

Browse Source 
JDK 10 has gone fully-modular. This means that:
 - when targeting JDK 8 with a JDK 10 compiler, we have to use the full
   profile
 - when targeting JDK 10 with a JDK 10 compiler, we have to use
   -add-modules java.base

Today we only target JDK 8 (our minimum compatibility version) so we
need to change the compiler flags conditional on using a JDK 10
compiler. This commit does that.

Relates #27884
This commit is contained in:
Jason Tedor 2017-12-20 16:22:21 -05:00 committed by GitHub
parent c8371fa0b4
commit 8bd7a19d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,11 @@ class BuildPlugin implements Plugin<Project> {
/** Adds compiler settings to the project */ /** Adds compiler settings to the project */
static void configureCompile(Project project) { static void configureCompile(Project project) {
project.ext.compactProfile = 'compact3' if (project.javaVersion < JavaVersion.VERSION_1_10) {
project.ext.compactProfile = 'compact3'
} else {
project.ext.compactProfile = 'full'
}
project.afterEvaluate { project.afterEvaluate {
project.tasks.withType(JavaCompile) { project.tasks.withType(JavaCompile) {
File gradleJavaHome = Jvm.current().javaHome File gradleJavaHome = Jvm.current().javaHome