diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/RunJvmTask.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/RunJvmTask.kt index 2495977499a..85b2de42755 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/RunJvmTask.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/RunJvmTask.kt @@ -25,10 +25,7 @@ open class RunJvmTask : JavaExec() { @Option(option = "verbose", description = "Verbose mode of running benchmarks") var verbose: Boolean = false - override fun configure(configureClosure: Closure): Task { - return super.configure(configureClosure) - } - + @JvmOverloads private fun executeTask(output: java.io.OutputStream? = null) { val filterArgs = filter.splitCommaSeparatedOption("-f") val filterRegexArgs = filterRegex.splitCommaSeparatedOption("-fr") @@ -37,11 +34,11 @@ open class RunJvmTask : JavaExec() { if (verbose) { args("-v") } - exec() + super.exec() } @TaskAction - fun run() { + override fun exec() { if (outputFileName != null) File(outputFileName).outputStream().use { output -> executeTask(output) } else diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt index 1175301b97b..22aaabf5d3d 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/KotlinNativeBenchmarkingPlugin.kt @@ -65,7 +65,7 @@ open class KotlinNativeBenchmarkingPlugin: BenchmarkingPlugin() { override fun Project.configureJvmTask(): Task { return tasks.create("jvmRun", RunJvmTask::class.java) { task -> - task.dependsOn("build") + task.dependsOn("jvmJar") val mainCompilation = kotlin.jvm().compilations.getByName("main") val runtimeDependencies = configurations.getByName(mainCompilation.runtimeDependencyConfigurationName) task.classpath(files(mainCompilation.output.allOutputs, runtimeDependencies)) diff --git a/performance/ring/src/main/kotlin-jvm/org/jetbrains/ring/Utils.kt b/performance/ring/src/main/kotlin-jvm/org/jetbrains/ring/UtilsJVM.kt similarity index 100% rename from performance/ring/src/main/kotlin-jvm/org/jetbrains/ring/Utils.kt rename to performance/ring/src/main/kotlin-jvm/org/jetbrains/ring/UtilsJVM.kt