From 31d9874c5b0b4a043ccf4b329b886fd160516b8d Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 13 Jun 2019 17:07:33 +0700 Subject: [PATCH] Benchmarks: Use Kotlin stdlib version specified in gradle.properties --- .../kotlin/benchmark/BenchmarkingPlugin.kt | 14 ++++++++++++-- 1 file changed, 12 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 a6b593d9edb..5fe12cfe33a 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 @@ -48,6 +48,12 @@ internal val Project.kotlinVersion: String internal val Project.konanVersion: String get() = property("konanVersion") as String +internal val Project.kotlinStdlibVersion: String + get() = property("kotlinStdlibVersion") as String + +internal val Project.kotlinStdlibRepo: String + get() = property("kotlinStdlibRepo") as String + internal val Project.nativeJson: String get() = project.property("nativeJson") as String @@ -86,11 +92,15 @@ open class BenchmarkingPlugin: Plugin { private fun Project.configureSourceSets(kotlinVersion: String) { with(kotlin.sourceSets) { commonMain.dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinStdlibVersion") } jvmMain.dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinStdlibVersion") + } + + repositories.maven { + it.setUrl(kotlinStdlibRepo) } // Add sources specified by a user in the benchmark DSL.