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

Merge branch 'master' into index-lifecycle

This commit is contained in:
Colin Goodheart-Smithe 2018-05-09 12:10:55 +01:00
parent 54d1efd73b 92a0b0a00c
commit a6dfd06939
No known key found for this signature in database
GPG Key ID: F975E7BDD739B3C7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,10 +535,15 @@ class BuildPlugin implements Plugin<Project> {
} }
// also apply release flag to groovy, which is used in build-tools // also apply release flag to groovy, which is used in build-tools
project.tasks.withType(GroovyCompile) { project.tasks.withType(GroovyCompile) {
final JavaVersion targetCompatibilityVersion = JavaVersion.toVersion(it.targetCompatibility) final compilerJavaHomeFile = new File(project.compilerJavaHome)
options.fork = true // we only fork if the Gradle JDK is not the same as the compiler JDK
options.forkOptions.javaHome = new File(project.compilerJavaHome) if (compilerJavaHomeFile.canonicalPath == Jvm.current().javaHome.canonicalPath) {
options.compilerArgs << '--release' << targetCompatibilityVersion.majorVersion options.fork = false
} else {
options.fork = true
options.forkOptions.javaHome = compilerJavaHomeFile
options.compilerArgs << '--release' << JavaVersion.toVersion(it.targetCompatibility).majorVersion
}
} }
} }
} }