Browse Source

Update Kotlin to 1.7.10

Closes gh-11374, gh-11534
pull/11599/head
Anbu Sampath 4 years ago committed by Marcus Da Coregio
parent
commit
0c14a36ad6
  1. 4
      config/spring-security-config.gradle
  2. 1
      config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt
  3. 2
      gradle.properties

4
config/spring-security-config.gradle

@ -110,8 +110,8 @@ rncToXsd {
tasks.withType(KotlinCompile).configureEach { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
languageVersion = "1.6" languageVersion = "1.7"
apiVersion = "1.6" apiVersion = "1.7"
freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"] freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"]
jvmTarget = "17" jvmTarget = "17"
} }

1
config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt

@ -73,6 +73,7 @@ class SessionFixationDsl {
SessionFixationStrategy.MIGRATE -> sessionFixation.migrateSession() SessionFixationStrategy.MIGRATE -> sessionFixation.migrateSession()
SessionFixationStrategy.CHANGE_ID -> sessionFixation.changeSessionId() SessionFixationStrategy.CHANGE_ID -> sessionFixation.changeSessionId()
SessionFixationStrategy.NONE -> sessionFixation.none() SessionFixationStrategy.NONE -> sessionFixation.none()
null -> null
} }
} }
} }

2
gradle.properties

@ -4,7 +4,7 @@ springBootVersion=2.4.2
springFrameworkVersion=6.0.0-SNAPSHOT springFrameworkVersion=6.0.0-SNAPSHOT
openSamlVersion=3.4.6 openSamlVersion=3.4.6
version=6.0.0-SNAPSHOT version=6.0.0-SNAPSHOT
kotlinVersion=1.6.21 kotlinVersion=1.7.10
samplesBranch=main samplesBranch=main
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true org.gradle.parallel=true

Loading…
Cancel
Save