azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Do not fork java compile tasks when current JDK can be used"

Browse Source 
This reverts commit f2021b58
This commit is contained in:
Alexey Tsvetkov
2019-07-03 12:46:50 +03:00
parent 9340bffd02
commit aa7aff84fc
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -13
View File
@@ -716,23 +716,12 @@ fun jdkPath(version: String): String {
fun Project.configureJvmProject(javaHome: String, javaVersion: 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> { tasks.withType<JavaCompile> {
if (name != "compileJava9Java") { if (name != "compileJava9Java") {
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
options.isFork = true
if (shouldFork) { options.forkOptions.javaHome = file(javaHome)
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.compilerArgs.add("-proc:none") options.compilerArgs.add("-proc:none")
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }