From 7fe9f0ea8bffa3c49c012ae8c7b06a67bf4051b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=BCller=20Philipp?= <15141339+Hermueller@users.noreply.github.com> Date: Wed, 28 Sep 2022 15:59:02 +0200 Subject: [PATCH] Fixed the Kotlin Version Bug (#89) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philipp Hermüller --- .../gradle/autoconfigure/kotlin/KotlinConfigurePlugin.kt | 2 +- .../gradle/autoconfigure/kotlin/KotlinConfigurePluginTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePlugin.kt b/src/main/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePlugin.kt index aa580c6..57b8b05 100644 --- a/src/main/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePlugin.kt +++ b/src/main/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePlugin.kt @@ -53,7 +53,7 @@ class KotlinConfigurePlugin : Plugin { .map { project.dependencies.platform("org.jetbrains.kotlin:kotlin-bom:$it") } ) this.implementation(kotlinConfigureExtension.kotlinVersion - .map { "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } + .map { "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$it" } ) } diff --git a/src/test/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePluginTest.kt b/src/test/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePluginTest.kt index 5aa967b..44b6664 100644 --- a/src/test/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePluginTest.kt +++ b/src/test/kotlin/io/cloudflight/gradle/autoconfigure/kotlin/KotlinConfigurePluginTest.kt @@ -59,7 +59,7 @@ class KotlinConfigurePluginTest { .containsEntry(Name.IMPLEMENTATION_TITLE, fixtureName) .containsEntry(Name.IMPLEMENTATION_VERSION, "1.0.0") - assertThat(result.normalizedOutput).contains("--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:${options.kotlinVersion}") + assertThat(result.normalizedOutput).contains("--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:${options.kotlinVersion}\n") // validate that Kotlin uses the jdk configured by the java toolchain val jdkHome = result.extractJavaToolchainJdkHome()