From da46164896c92da4ad1a746e4890d65f0fa4d2a5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Fri, 30 Nov 2018 19:06:07 +0300 Subject: [PATCH] Build: use UtilityJavaExec task to serialize builtins --- core/builtins/build.gradle.kts | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts index 01d4324dfc5..27b8724f3cc 100644 --- a/core/builtins/build.gradle.kts +++ b/core/builtins/build.gradle.kts @@ -18,23 +18,16 @@ val clean by tasks.getting { } } -val JDK_18: String = rootProject.extra["JDK_18"] as String - -// We avoid using JavaExec task here due to IDEA-200192: -// IDEA attaches debugger to all JavaExec tasks making our breakpoints trigger during irrelevant task execution -val serialize by tasks.creating(Exec::class) { +val serialize by tasks.creating(UtilityJavaExec::class) { val outDir = builtinsSerialized val inDirs = arrayOf(builtinsSrc, builtinsNative) inDirs.forEach { inputs.dir(it) } outputs.dir(outDir) - commandLine( - "$JDK_18/bin/java", - "-Didea.io.use.nio2=true", - "-cp", rootProject.buildscript.configurations["bootstrapCompilerClasspath"].asPath, - "org.jetbrains.kotlin.serialization.builtins.RunKt", - outDir, *inDirs - ) + classpath(rootProject.buildscript.configurations["bootstrapCompilerClasspath"]) + main = "org.jetbrains.kotlin.serialization.builtins.RunKt" + jvmArgs("-Didea.io.use.nio2=true") + args(outDir, *inDirs) } val builtinsJar by task {