From aaceb9565c5fa0fe78fca84d47d9dcd24fc4bf5e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 17 May 2021 12:05:34 +0100 Subject: [PATCH] Upgrade to Kotlin 1.5.0 Closes gh-26553 --- buildSrc/build.gradle | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 19bd4d14c2..8b928caa83 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation("org.apache.maven:maven-embedder:3.6.2") implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2") implementation("org.gradle:test-retry-gradle-plugin:1.1.9") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0-RC") - implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.0-RC") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") + implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.0") implementation("org.springframework:spring-core:5.2.2.RELEASE") implementation("org.springframework:spring-web:5.2.2.RELEASE") implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}") diff --git a/gradle.properties b/gradle.properties index cf4f7490b1..5ac58b80d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 -kotlinVersion=1.5.0-RC +kotlinVersion=1.5.0 tomcatVersion=9.0.45 kotlin.stdlib.default.dependency=false