Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F - Migrasjon kotlin 1.9.10 -> 1.9.22 #15

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext {
kotlinVersion = '1.9.22'
springBootVersion = '3.1.5'
springKafkaVersion = '3.0.12'
tokenSupportVersion = '3.2.0'
Expand All @@ -20,6 +21,9 @@ plugins {
id 'org.springframework.boot' version "${springBootVersion}"
id "io.spring.dependency-management" version "1.1.4"
id "org.openrepose.gradle.plugins.jaxb" version "2.5.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"
Expand Down
23 changes: 6 additions & 17 deletions buildSrc/ep-module.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
buildscript {
ext {
kotlinVersion = '1.9.10'
}
repositories {
mavenCentral()
maven {
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down