From bb53a99defc5ec70393ff21a8a40f74d650e2e1a Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 14 Dec 2021 15:25:50 +0100 Subject: [PATCH] Upgrade to Kotlin 1.6.10 Closes gh-27413 --- build.gradle | 10 +++++----- .../context/support/BeanDefinitionDsl.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1d7fba3c02..23c1600d55 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { id 'io.spring.nohttp' version '0.0.10' id "io.freefair.aspectj" version '6.3.0' apply false id 'org.jetbrains.dokka' version '1.5.0' apply false - id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false - id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false + id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false + id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false id 'org.asciidoctor.jvm.convert' version '3.3.2' id 'org.asciidoctor.jvm.pdf' version '3.3.2' id "org.unbroken-dome.xjc" version '2.0.0' apply false @@ -33,7 +33,7 @@ configure(allprojects) { project -> mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10" mavenBom "io.rsocket:rsocket-bom:1.1.1" mavenBom "org.eclipse.jetty:jetty-bom:11.0.7" - mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31" + mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2" mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2" mavenBom "org.junit:junit-bom:5.8.2" @@ -277,8 +277,8 @@ configure([rootProject] + javaProjects) { project -> compileKotlin { kotlinOptions { - languageVersion = "1.3" - apiVersion = "1.3" + languageVersion = "1.6" + apiVersion = "1.6" freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"] allWarningsAsErrors = true } diff --git a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt index f5dfa91868..a137231589 100644 --- a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt +++ b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt @@ -178,7 +178,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit role: Role? = null) { val customizer = BeanDefinitionCustomizer { bd -> - scope?.let { bd.scope = scope.name.toLowerCase() } + scope?.let { bd.scope = scope.name.lowercase() } isLazyInit?.let { bd.isLazyInit = isLazyInit } isPrimary?.let { bd.isPrimary = isPrimary } isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate } @@ -221,7 +221,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit crossinline function: BeanSupplierContext.() -> T) { val customizer = BeanDefinitionCustomizer { bd -> - scope?.let { bd.scope = scope.name.toLowerCase() } + scope?.let { bd.scope = scope.name.lowercase() } isLazyInit?.let { bd.isLazyInit = isLazyInit } isPrimary?.let { bd.isPrimary = isPrimary } isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate }