From 0757db780edb80e7d3c02e3f7fd7238b89cd0d66 Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Thu, 23 May 2024 22:15:44 +0200 Subject: [PATCH] switch to compilerOptions as kotlinOptions was deprecated in kotlin 2.0 --- .../kotlin/build-logic.kotlin-jvm-conventions.gradle.kts | 7 +++---- misc/js-stubs/build.gradle.kts | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm-conventions.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm-conventions.gradle.kts index bc4d1f81c6..b1f0f737ca 100644 --- a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm-conventions.gradle.kts +++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm-conventions.gradle.kts @@ -1,5 +1,4 @@ -import org.jetbrains.kotlin.gradle.dsl.KotlinVersion -import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -11,7 +10,7 @@ plugins { } tasks.configureEach { - kotlinOptions { - jvmTarget = buildParameters.defaultJdkVersion.toString() + compilerOptions{ + jvmTarget.set(JvmTarget.fromTarget(buildParameters.defaultJdkVersion.toString())) } } diff --git a/misc/js-stubs/build.gradle.kts b/misc/js-stubs/build.gradle.kts index 9d35e771a2..fd563bf723 100644 --- a/misc/js-stubs/build.gradle.kts +++ b/misc/js-stubs/build.gradle.kts @@ -11,7 +11,3 @@ kotlin { nodejs() } } -// -//dependencies{ -// api(libs.spek.common) -//}