chore: proper kotlin 2.0.0 dsl foe java version (#74)

navikt · Jun 4, 2024 · 5d08bff · 5d08bff
1 parent 03d0e59
commit 5d08bff
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 group = "no.nav.pdfgen"
 version = properties["version"]?.takeIf { it is String && it.isNotEmpty() && it != "unspecified" } ?: "local-build"
 println(version)
@@ -17,7 +19,7 @@ val verapdfVersion = "1.26.1"
 val ktfmtVersion = "0.44"
 val kotlinloggerVersion = "6.0.9"
 val kotestVersion = "5.9.0"
-val javaVersion = JavaVersion.VERSION_21
+val javaVersion = JvmTarget.JVM_21
 
 
 plugins {
@@ -29,8 +31,13 @@ plugins {
     id("java-library")
 }
 
-tasks {
+kotlin {
+    compilerOptions {
+        jvmTarget.set(javaVersion)
+    }
+}
 
+tasks {
     test {
         useJUnitPlatform()
         testLogging {
@@ -40,13 +47,6 @@ tasks {
         }
     }
 
-    compileKotlin {
-        kotlinOptions.jvmTarget = javaVersion.toString()
-    }
-    compileTestKotlin {
-        kotlinOptions.jvmTarget = javaVersion.toString()
-    }
-
     spotless {
         kotlin { ktfmt(ktfmtVersion).kotlinlangStyle() }
         check {