From 0c14a36ad6609b0ed15c028ce6a3764da2ae0ef1 Mon Sep 17 00:00:00 2001 From: Anbu Sampath Date: Sat, 18 Jun 2022 09:43:24 -0300 Subject: [PATCH] Update Kotlin to 1.7.10 Closes gh-11374, gh-11534 --- config/spring-security-config.gradle | 4 ++-- .../config/annotation/web/session/SessionFixationDsl.kt | 1 + gradle.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 2f2c140433..32a2654f61 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -110,8 +110,8 @@ rncToXsd { tasks.withType(KotlinCompile).configureEach { kotlinOptions { - languageVersion = "1.6" - apiVersion = "1.6" + languageVersion = "1.7" + apiVersion = "1.7" freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"] jvmTarget = "17" } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt index 92634a2dd7..c311603244 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt @@ -73,6 +73,7 @@ class SessionFixationDsl { SessionFixationStrategy.MIGRATE -> sessionFixation.migrateSession() SessionFixationStrategy.CHANGE_ID -> sessionFixation.changeSessionId() SessionFixationStrategy.NONE -> sessionFixation.none() + null -> null } } } diff --git a/gradle.properties b/gradle.properties index dcfb2a3275..f90791346f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ springBootVersion=2.4.2 springFrameworkVersion=6.0.0-SNAPSHOT openSamlVersion=3.4.6 version=6.0.0-SNAPSHOT -kotlinVersion=1.6.21 +kotlinVersion=1.7.10 samplesBranch=main org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true