Skip to content

Commit 08855fe

Browse files
committed
Upgrade to Kotlin 1.5.0
This commit retains Kotlin 1.3 compatibility and upgrades Kotlin Serialization to 1.2.0. Closes gh-26792 Closes gh-26887
1 parent 66cd979 commit 08855fe

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
33
id 'io.spring.nohttp' version '0.0.5.RELEASE'
4-
id 'org.jetbrains.kotlin.jvm' version '1.4.32' apply false
4+
id 'org.jetbrains.kotlin.jvm' version '1.5.0' apply false
55
id 'org.jetbrains.dokka' version '0.10.1' apply false
66
id 'org.asciidoctor.jvm.convert' version '3.1.0'
77
id 'org.asciidoctor.jvm.pdf' version '3.1.0'
@@ -10,7 +10,7 @@ plugins {
1010
id "com.github.ben-manes.versions" version '0.28.0'
1111
id "com.github.johnrengelman.shadow" version "6.1.0" apply false
1212
id "me.champeau.jmh" version "0.6.4" apply false
13-
id "org.jetbrains.kotlin.plugin.serialization" version "1.4.32" apply false
13+
id "org.jetbrains.kotlin.plugin.serialization" version "1.5.0" apply false
1414
id "org.unbroken-dome.xjc" version '2.0.0' apply false
1515
}
1616

@@ -33,8 +33,9 @@ configure(allprojects) { project ->
3333
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR9"
3434
mavenBom "io.rsocket:rsocket-bom:1.1.0"
3535
mavenBom "org.eclipse.jetty:jetty-bom:9.4.39.v20210325"
36-
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.32"
36+
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.0"
3737
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.4.3"
38+
mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.0"
3839
mavenBom "org.junit:junit-bom:5.7.1"
3940
}
4041
dependencies {
@@ -91,10 +92,6 @@ configure(allprojects) { project ->
9192
}
9293
dependency "org.ogce:xpp3:1.1.6"
9394
dependency "org.yaml:snakeyaml:1.28"
94-
dependencySet(group: 'org.jetbrains.kotlinx', version: '1.0.1') {
95-
entry 'kotlinx-serialization-core'
96-
entry 'kotlinx-serialization-json'
97-
}
9895

9996
dependency "com.h2database:h2:1.4.200"
10097
dependency "com.github.ben-manes.caffeine:caffeine:2.9.0"
@@ -319,7 +316,7 @@ configure([rootProject] + javaProjects) { project ->
319316
kotlinOptions {
320317
languageVersion = "1.3"
321318
apiVersion = "1.3"
322-
freeCompilerArgs = ["-Xjsr305=strict"]
319+
freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings"]
323320
allWarningsAsErrors = true
324321
}
325322
}

0 commit comments

Comments
 (0)