|
1 | 1 | buildscript {
|
2 |
| - ext.kotlinVersion = '1.1.2' |
| 2 | + ext.kotlinVersion = '1.1.2-3' |
3 | 3 | repositories {
|
4 | 4 | maven { url "https://repo.spring.io/plugins-release" }
|
5 | 5 | }
|
@@ -108,18 +108,15 @@ configure(allprojects) { project ->
|
108 | 108 | apply from: "${gradleScriptDir}/ide.gradle"
|
109 | 109 | apply from: "${gradleScriptDir}/sniffer.gradle"
|
110 | 110 |
|
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"] |
117 | 115 |
|
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"] |
123 | 120 | }
|
124 | 121 |
|
125 | 122 | configurations.all {
|
@@ -594,11 +591,6 @@ project("spring-messaging") {
|
594 | 591 | testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
|
595 | 592 | testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
|
596 | 593 | }
|
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 |
| - } |
602 | 594 | }
|
603 | 595 |
|
604 | 596 | project("spring-tx") {
|
@@ -776,11 +768,6 @@ project("spring-web") {
|
776 | 768 | testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
|
777 | 769 | testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
|
778 | 770 | }
|
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 |
| - } |
784 | 771 | }
|
785 | 772 |
|
786 | 773 | project("spring-webflux") {
|
@@ -842,11 +829,6 @@ project("spring-webflux") {
|
842 | 829 | testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
|
843 | 830 | testRuntime("org.synchronoss.cloud:nio-multipart-parser:${niomultipartVersion}")
|
844 | 831 | }
|
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 |
| - } |
850 | 832 | }
|
851 | 833 |
|
852 | 834 | project("spring-orm") {
|
@@ -1002,13 +984,6 @@ project("spring-websocket") {
|
1002 | 984 | testCompile("io.projectreactor.ipc:reactor-netty")
|
1003 | 985 | testCompile("io.netty:netty-all")
|
1004 | 986 | }
|
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 |
| - } |
1012 | 987 | }
|
1013 | 988 |
|
1014 | 989 | project("spring-test") {
|
|
0 commit comments