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

…ithub-actions chore(deps): Update gradle and github actions to v2 (major)
KyoriPowered · May 28, 2024 · 1840846 · 1840846
2 parents bd6cd6a + 2d6ebeb
commit 1840846
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,7 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
 import net.kyori.indra.git.IndraGitExtension
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 
 plugins {
@@ -51,15 +54,18 @@ kotlin {
 
     jvm {
         withJava()
-        compilations.configureEach {
-            kotlinOptions.jvmTarget = "$javaTarget"
-            kotlinOptions.freeCompilerArgs += "-Xjdk-release=$javaTarget"
+        compilerOptions {
+            jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("$javaTarget")
+            freeCompilerArgs.add("-Xjdk-release=$javaTarget")
         }
     }
 
-    js(IR) {
+    js {
         browser {
         }
+        compilerOptions {
+            target = "es2015"
+        }
         binaries.executable()
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 adventure = "4.17.0"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 ktlint = "1.0.1"
 ktor = "2.3.11"