Skip to content

Commit bb53a99

Browse files
committed
Upgrade to Kotlin 1.6.10
Closes gh-27413
1 parent 8d93dc4 commit bb53a99

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
id 'io.spring.nohttp' version '0.0.10'
44
id "io.freefair.aspectj" version '6.3.0' apply false
55
id 'org.jetbrains.dokka' version '1.5.0' apply false
6-
id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
7-
id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
6+
id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
7+
id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
88
id 'org.asciidoctor.jvm.convert' version '3.3.2'
99
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
1010
id "org.unbroken-dome.xjc" version '2.0.0' apply false
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
3333
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
3434
mavenBom "io.rsocket:rsocket-bom:1.1.1"
3535
mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
36-
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
36+
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
3737
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
3838
mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
3939
mavenBom "org.junit:junit-bom:5.8.2"
@@ -277,8 +277,8 @@ configure([rootProject] + javaProjects) { project ->
277277

278278
compileKotlin {
279279
kotlinOptions {
280-
languageVersion = "1.3"
281-
apiVersion = "1.3"
280+
languageVersion = "1.6"
281+
apiVersion = "1.6"
282282
freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"]
283283
allWarningsAsErrors = true
284284
}

spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit
178178
role: Role? = null) {
179179

180180
val customizer = BeanDefinitionCustomizer { bd ->
181-
scope?.let { bd.scope = scope.name.toLowerCase() }
181+
scope?.let { bd.scope = scope.name.lowercase() }
182182
isLazyInit?.let { bd.isLazyInit = isLazyInit }
183183
isPrimary?.let { bd.isPrimary = isPrimary }
184184
isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate }
@@ -221,7 +221,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit
221221
crossinline function: BeanSupplierContext.() -> T) {
222222

223223
val customizer = BeanDefinitionCustomizer { bd ->
224-
scope?.let { bd.scope = scope.name.toLowerCase() }
224+
scope?.let { bd.scope = scope.name.lowercase() }
225225
isLazyInit?.let { bd.isLazyInit = isLazyInit }
226226
isPrimary?.let { bd.isPrimary = isPrimary }
227227
isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate }

0 commit comments

Comments
 (0)