F - Migrering mot kotlin 1.9.22

navikt · Dec 21, 2023 · bec8921 · bec8921
1 parent 0316abb
commit bec8921
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
 	ext {
+		kotlinVersion = '1.9.22'
 		springBootVersion = '3.1.5'
 		springKafkaVersion = '3.0.12'
 		tokenSupportVersion = '3.2.0'
@@ -12,6 +13,9 @@ plugins {
 	id "io.spring.dependency-management" version "1.1.4"
 	id "org.openrepose.gradle.plugins.jaxb" version "2.5.0"
 	id 'com.cosminpolifronie.gradle.plantuml' version '1.6.0'
+	id "org.jetbrains.kotlin.jvm" version "$kotlinVersion"
+	id "org.jetbrains.kotlin.plugin.spring" version "$kotlinVersion"
+	id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion"
 }
 
 apply from: "buildSrc/ep-module.gradle"

diff --git a/buildSrc/ep-module.gradle b/buildSrc/ep-module.gradle
@@ -1,7 +1,4 @@
 buildscript {
-    ext {
-        kotlinVersion = '1.9.10'
-    }
     repositories {
         mavenCentral()
         maven {
@@ -14,13 +11,9 @@ buildscript {
         classpath "se.patrikerdes:gradle-use-latest-versions-plugin:0.2.18"
         classpath "org.owasp:dependency-check-gradle:8.1.0"
         classpath "com.adarshr:gradle-test-logger-plugin:4.0.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }
 }
 
-apply plugin: org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
-apply plugin: org.jetbrains.kotlin.allopen.gradle.SpringGradleSubplugin
 apply plugin: com.github.benmanes.gradle.versions.VersionsPlugin
 apply plugin: se.patrikerdes.UseLatestVersionsPlugin
 apply plugin: org.owasp.dependencycheck.gradle.DependencyCheckPlugin
@@ -54,19 +47,15 @@ java {
 }
 
 compileKotlin {
-    kotlinOptions {
-        freeCompilerArgs = ["-Xjsr305=strict"]
-        jvmTarget = "17"
-        allWarningsAsErrors = true
-    }
+    kotlinOptions.jvmTarget =  "17"
+    kotlinOptions.allWarningsAsErrors = true
+    kotlinOptions.freeCompilerArgs += "-Xjsr305=strict"
 }
 
 compileTestKotlin {
-    kotlinOptions {
-        freeCompilerArgs = ['-Xjsr305=strict']
-        jvmTarget = '17'
-        allWarningsAsErrors = true
-    }
+    kotlinOptions.jvmTarget =  "17"
+    kotlinOptions.allWarningsAsErrors = true
+    kotlinOptions.freeCompilerArgs += "-Xjsr305=strict"
 }
 
 test {