From 3e1bf4991d0c656f4a49033f54fe7fc9b52827a3 Mon Sep 17 00:00:00 2001 From: LamGC Date: Wed, 11 Dec 2024 00:47:57 +0800 Subject: [PATCH] =?UTF-8?q?build(deps):=20=E5=B0=86=20Kotlin=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=202.1.0=20=E7=89=88=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- scalabot-app/build.gradle.kts | 9 ++++++--- scalabot-meta/build.gradle.kts | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c7be3f6..8cb8ae3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.23" apply false + kotlin("jvm") version "2.1.0" apply false id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false } diff --git a/scalabot-app/build.gradle.kts b/scalabot-app/build.gradle.kts index fb0ef1b..8655b58 100644 --- a/scalabot-app/build.gradle.kts +++ b/scalabot-app/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -25,7 +26,7 @@ dependencies { implementation("org.codehaus.plexus:plexus-utils:3.5.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23") + implementation("org.jetbrains.kotlin:kotlin-reflect:2.1.0") implementation("com.google.code.gson:gson:2.10.1") implementation("org.jdom:jdom2:2.0.6.1") @@ -44,11 +45,13 @@ dependencies { tasks.test { useJUnitPlatform() - + jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED") } tasks.withType { - kotlinOptions.jvmTarget = "17" + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + } } application { diff --git a/scalabot-meta/build.gradle.kts b/scalabot-meta/build.gradle.kts index f9580d9..130cd0c 100644 --- a/scalabot-meta/build.gradle.kts +++ b/scalabot-meta/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { kotlin("jvm") id("org.jetbrains.kotlinx.kover") @@ -25,8 +27,8 @@ dependencies { } tasks.withType().configureEach { - kotlinOptions { - jvmTarget = "17" + compilerOptions { + jvmTarget = JvmTarget.JVM_17 } }