Browse Source

Update to Kotlin 1.5.0

Closes gh-9763
pull/9630/head
Rob Winch 5 years ago
parent
commit
e5a652e749
  1. 4
      config/spring-security-config.gradle
  2. 2
      dependencies/spring-security-dependencies.gradle
  3. 2
      gradle.properties

4
config/spring-security-config.gradle

@ -101,8 +101,10 @@ rncToXsd {
tasks.withType(KotlinCompile).configureEach { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
apiVersion = "1.4"
freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"]
jvmTarget = "1.8" jvmTarget = "1.8"
freeCompilerArgs = ["-Xjsr305=strict"] languageVersion = "1.4"
} }
} }

2
dependencies/spring-security-dependencies.gradle vendored

@ -12,7 +12,7 @@ dependencies {
api platform("io.rsocket:rsocket-bom:1.1.0") api platform("io.rsocket:rsocket-bom:1.1.0")
api platform("org.springframework.data:spring-data-bom:2021.0.1") api platform("org.springframework.data:spring-data-bom:2021.0.1")
api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")
api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.4.3") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.0")
api platform("com.fasterxml.jackson:jackson-bom:2.12.3") api platform("com.fasterxml.jackson:jackson-bom:2.12.3")
constraints { constraints {
api "ch.qos.logback:logback-classic:1.2.3" api "ch.qos.logback:logback-classic:1.2.3"

2
gradle.properties

@ -3,7 +3,7 @@ springJavaformatVersion=0.0.28
springBootVersion=2.4.2 springBootVersion=2.4.2
openSamlVersion=3.4.6 openSamlVersion=3.4.6
version=5.5.0-SNAPSHOT version=5.5.0-SNAPSHOT
kotlinVersion=1.4.32 kotlinVersion=1.5.0
org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.caching=true org.gradle.caching=true

Loading…
Cancel
Save