From aa7aff84fc6bb01f332c8e2c9e825d7309f547d0 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Wed, 3 Jul 2019 12:46:50 +0300
Subject: [PATCH] Revert "Do not fork java compile tasks when current JDK can
 be used"

This reverts commit f2021b58
---
 build.gradle.kts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 183b3f8cb60..f9d7368ea5c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -716,23 +716,12 @@ fun jdkPath(version: String): String {
 
 
 fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
-    val currentJavaHome = File(System.getProperty("java.home")!!).canonicalPath
-    val shouldFork = !currentJavaHome.startsWith(File(javaHome).canonicalPath)
-
     tasks.withType<JavaCompile> {
         if (name != "compileJava9Java") {
             sourceCompatibility = javaVersion
             targetCompatibility = javaVersion
-
-            if (shouldFork) {
-                logger.info("$path will be forked with $javaHome")
-                options.isFork = true
-                options.forkOptions.javaHome = file(javaHome)
-            } else {
-                options.isFork = false
-                options.forkOptions.javaHome = null
-            }
-
+            options.isFork = true
+            options.forkOptions.javaHome = file(javaHome)
             options.compilerArgs.add("-proc:none")
             options.encoding = "UTF-8"
         }