From bd6f2ae01ccac1315e723bd9844efaf40c08a3c2 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 13 Jun 2019 15:48:29 +0700 Subject: [PATCH] Benchmarks: Explicitly specify Kotlin/JVM compiler --- .../org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt index 4405229121f..86b306f4622 100644 --- a/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt +++ b/buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt @@ -68,8 +68,6 @@ open class BenchmarkExtension @Inject constructor(val project: Project) { var linkerOpts: Collection = emptyList() } -// TODO: Override kotlin compiler with a correct version. - /** * A plugin configuring a benchmark Kotlin/Native project. */ @@ -218,6 +216,10 @@ open class BenchmarkingPlugin: Plugin { override fun apply(target: Project) = with(target) { pluginManager.apply("kotlin-multiplatform") + + // Use Kotlin compiler version specified by the project property. + dependencies.add("kotlinCompilerClasspath", "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion") + extensions.create(BENCHMARK_EXTENSION_NAME, BenchmarkExtension::class.java, this) configureMPPExtension() addTimeListener(this)