Sette java versjon på både java og kotlin via toolchain

navikt · Oct 26, 2023 · 267dfe7 · 267dfe7
1 parent c8b3826
commit 267dfe7
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,8 +30,9 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 configurations {
@@ -128,19 +129,20 @@ spotless {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.freeCompilerArgs = listOf("-Xuse-experimental=io.ktor.locations.KtorExperimentalLocationsAPI")
-    kotlinOptions.jvmTarget = "1.8"
-}
-
 tasks.withType<Test> {
     useJUnitPlatform()
     testLogging {
         showExceptions = true
         showStackTraces = true
         showStandardStreams = true
         exceptionFormat = TestExceptionFormat.FULL
-        events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED, TestLogEvent.STANDARD_OUT, TestLogEvent.STANDARD_ERROR)
+        events = setOf(
+            TestLogEvent.PASSED,
+            TestLogEvent.SKIPPED,
+            TestLogEvent.FAILED,
+            TestLogEvent.STANDARD_OUT,
+            TestLogEvent.STANDARD_ERROR
+        )
     }
 }