Feature/use k2 compiler (#314)

BSStudio · Apr 20, 2024 · c9ed41b · c9ed41b
1 parent 8cd0e93
commit c9ed41b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
 java=21.0.2-librca
-gradle=8.6
+gradle=8.7
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,10 +10,10 @@ dependencies {
     implementation(libs.plugin.springBoot)
     implementation(libs.plugin.springDependencyManagement)
     implementation(libs.plugin.spotless)
-    implementation(kotlin("allopen", "1.9.23"))
-    implementation(kotlin("gradle-plugin", "1.9.23"))
+    implementation(kotlin("allopen", "2.0.0-RC1"))
+    implementation(kotlin("gradle-plugin", "2.0.0-RC1"))
     // required for kotlin plugin jpa
-    implementation(kotlin("reflect", "1.9.23"))
-    implementation(kotlin("stdlib-jdk8", "1.9.23"))
-    implementation(kotlin("noarg", "1.9.23"))
+    implementation(kotlin("reflect", "2.0.0-RC1"))
+    implementation(kotlin("stdlib-jdk8", "2.0.0-RC1"))
+    implementation(kotlin("noarg", "2.0.0-RC1"))
 }
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm")
     kotlin("plugin.spring")
@@ -6,8 +8,8 @@ plugins {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
+    compilerOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "21"
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }