Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop forking javac #30462

Merged
merged 3 commits into from
May 8, 2018
Merged

Stop forking javac #30462

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
857d5fe
Stop forking javac
jasontedor May 8, 2018
f526d44
Fork if needed
jasontedor May 8, 2018
191118d
Iteration
jasontedor May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ class BuildPlugin implements Plugin<Project> {
project.afterEvaluate {
project.tasks.withType(JavaCompile) {
final JavaVersion targetCompatibilityVersion = JavaVersion.toVersion(it.targetCompatibility)
// we fork because compiling lots of different classes in a shared jvm can eventually trigger GC overhead limitations
options.fork = true
// we only fork if the Gradle JDK is not the same as the compiler JDK
options.fork = new File(project.compilerJavaHome) != Jvm.current().javaHome
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe same check as a bit above that:

new File(compilerJavaHome).canonicalPath != gradleJavaHome.canonicalPath

options.forkOptions.javaHome = new File(project.compilerJavaHome)
options.forkOptions.memoryMaximumSize = "512m"
if (targetCompatibilityVersion == JavaVersion.VERSION_1_8) {
Expand Down