Skip to content

Commit edbf9fa

Browse files
committed
Upgrade to Kotlin 1.1.2-3
Also removes JDK 9 build support for the time being since Gradle 3.5 still doesn't run on JDK 9.
1 parent 39f8bd6 commit edbf9fa

File tree

1 file changed

+9
-34
lines changed

1 file changed

+9
-34
lines changed

build.gradle

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.1.2'
2+
ext.kotlinVersion = '1.1.2-3'
33
repositories {
44
maven { url "https://repo.spring.io/plugins-release" }
55
}
@@ -108,18 +108,15 @@ configure(allprojects) { project ->
108108
apply from: "${gradleScriptDir}/ide.gradle"
109109
apply from: "${gradleScriptDir}/sniffer.gradle"
110110

111-
// Kotlin compiler does not support JDK 9 yet, see https://youtrack.jetbrains.com/issue/KT-14988
112-
if (!JavaVersion.current().java9Compatible) {
113-
apply plugin: "kotlin"
114-
compileKotlin {
115-
kotlinOptions.jvmTarget = "1.8"
116-
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
111+
apply plugin: "kotlin"
112+
compileKotlin {
113+
kotlinOptions.jvmTarget = "1.8"
114+
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
117115

118-
}
119-
compileTestKotlin {
120-
kotlinOptions.jvmTarget = "1.8"
121-
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
122-
}
116+
}
117+
compileTestKotlin {
118+
kotlinOptions.jvmTarget = "1.8"
119+
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
123120
}
124121

125122
configurations.all {
@@ -594,11 +591,6 @@ project("spring-messaging") {
594591
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
595592
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
596593
}
597-
598-
if (JavaVersion.current().java9Compatible) {
599-
// Reactor2TcpClient's use of Netty requires access to sun.nio.ch.SelectorImpl
600-
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
601-
}
602594
}
603595

604596
project("spring-tx") {
@@ -776,11 +768,6 @@ project("spring-web") {
776768
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
777769
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
778770
}
779-
780-
if (JavaVersion.current().java9Compatible) {
781-
// Netty4ClientHttpRequestFactory requires access to sun.nio.ch.SelectorImpl
782-
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
783-
}
784771
}
785772

786773
project("spring-webflux") {
@@ -842,11 +829,6 @@ project("spring-webflux") {
842829
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
843830
testRuntime("org.synchronoss.cloud:nio-multipart-parser:${niomultipartVersion}")
844831
}
845-
846-
if (JavaVersion.current().java9Compatible) {
847-
// ReactorClientHttpConnector requires access to sun.nio.ch.SelectorImpl
848-
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
849-
}
850832
}
851833

852834
project("spring-orm") {
@@ -1002,13 +984,6 @@ project("spring-websocket") {
1002984
testCompile("io.projectreactor.ipc:reactor-netty")
1003985
testCompile("io.netty:netty-all")
1004986
}
1005-
1006-
if (JavaVersion.current().java9Compatible) {
1007-
// JAXB requires java.util.logging
1008-
test.jvmArgs(["--add-modules", "java.logging"])
1009-
// ReactorNettyTcpClient's use of Netty requires access to sun.nio.ch.SelectorImpl
1010-
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
1011-
}
1012987
}
1013988

1014989
project("spring-test") {

0 commit comments

Comments
 (0)