Merge pull request #1083 from KyoriPowered/renovate/major-gradle-and-…

…github-actions chore(deps): Update plugin kotlin to v2
KyoriPowered · Jun 23, 2024 · 359ef1b · 359ef1b
2 parents 738f047 + 5ce97a4
commit 359ef1b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/extra-kotlin/build.gradle.kts b/extra-kotlin/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
   id("adventure.common-conventions")
   alias(libs.plugins.kotlin)
@@ -6,13 +9,10 @@ plugins {
 kotlin {
   explicitApi()
   coreLibrariesVersion = "1.4.32"
-  target {
-    compilations.configureEach {
-      kotlinOptions {
-        jvmTarget = "1.8"
-        languageVersion = "1.4"
-      }
-    }
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
+    @Suppress("DEPRECATION")
+    languageVersion = KotlinVersion.KOTLIN_1_4
   }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -75,5 +75,5 @@ zJmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 [plugins]
 indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
-kotlin = "org.jetbrains.kotlin.jvm:1.9.24"
+kotlin = "org.jetbrains.kotlin.jvm:2.0.0"
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }