From 0b9b49b1a3d5916f7edb624697fd759d32e2b59d Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 17 Jul 2023 11:40:37 -0600 Subject: [PATCH] Update to Kotlin 1.9.0 Closes gh-13539 --- build.gradle | 2 +- dependencies/spring-security-dependencies.gradle | 2 +- gradle.properties | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 72146ba127..1355c6da9c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion" classpath 'io.spring.nohttp:nohttp-gradle:0.0.11' classpath "io.freefair.gradle:aspectj-plugin:6.6.3" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinBuildDependencyVersion" classpath "com.netflix.nebula:nebula-project-plugin:8.2.0" } repositories { diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index b37d1d1463..29b5fd2cc2 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -13,7 +13,7 @@ dependencies { api platform("org.junit:junit-bom:5.10.0-RC1") api platform("org.mockito:mockito-bom:4.11.0") api platform("org.springframework.data:spring-data-bom:2022.0.7") - api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") + api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinDependencyVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.2") api platform("com.fasterxml.jackson:jackson-bom:2.15.2") constraints { diff --git a/gradle.properties b/gradle.properties index 707dd47f1d..4d694aab2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,8 @@ springFrameworkVersion=6.1.0-M2 micrometerVersion=1.12.0-M1 openSamlVersion=4.3.0 version=6.2.0-SNAPSHOT -kotlinVersion=1.8.22 +kotlinBuildDependencyVersion=1.8.22 +kotlinDependencyVersion=1.9.0 samplesBranch=main org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true