Skip to content

Commit 7368f58

Browse files
committed
Upgrade to Kotlin 1.2
apiVersion and languageVersion options are set to 1.1 on production code in order to avoid incompatibilities with Kotlin 1.1 based projects or libraries. Issue: SPR-16239
1 parent 63c2c08 commit 7368f58

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

build.gradle

+12-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
plugins {
1515
id "com.gradle.build-scan" version "1.8"
1616
id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false
17-
id "org.jetbrains.kotlin.jvm" version "1.1.61" apply false
17+
id "org.jetbrains.kotlin.jvm" version "1.2.0" apply false
1818
id "org.jetbrains.dokka" version "0.9.15"
1919
id "org.asciidoctor.convert" version "1.5.6"
2020
}
@@ -50,7 +50,7 @@ configure(allprojects) { project ->
5050
ext.junitJupiterVersion = "5.0.2"
5151
ext.junitPlatformVersion = "1.0.2"
5252
ext.junitVintageVersion = "4.12.2"
53-
ext.kotlinVersion = "1.1.61"
53+
ext.kotlinVersion = "1.2.0"
5454
ext.log4jVersion = "2.10.0"
5555
ext.nettyVersion = "4.1.17.Final"
5656
ext.reactorVersion = "Bismuth-SR4"
@@ -71,13 +71,19 @@ configure(allprojects) { project ->
7171

7272
apply plugin: "kotlin"
7373
compileKotlin {
74-
kotlinOptions.jvmTarget = "1.8"
75-
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305=strict"]
74+
kotlinOptions {
75+
jvmTarget = "1.8"
76+
freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305=strict"]
77+
apiVersion = "1.1"
78+
languageVersion = "1.1"
79+
}
7680

7781
}
7882
compileTestKotlin {
79-
kotlinOptions.jvmTarget = "1.8"
80-
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305=strict"]
83+
kotlinOptions {
84+
jvmTarget = "1.8"
85+
freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305=strict"]
86+
}
8187
}
8288

8389
configurations.all {

0 commit comments

Comments
 (0)