root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Juergen Hoeller 2017-05-05 23:55:18 +02:00
parent 39f8bd663e
commit edbf9fa74e
1 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
build.gradle
View File

@ -1,5 +1,5 @@
buildscript {
ext.kotlinVersion = '1.1.2'
ext.kotlinVersion = '1.1.2-3'
repositories {
maven { url "https://repo.spring.io/plugins-release" }
}
@ -108,18 +108,15 @@ configure(allprojects) { project ->
apply from: "${gradleScriptDir}/ide.gradle"
apply from: "${gradleScriptDir}/sniffer.gradle"
// Kotlin compiler does not support JDK 9 yet, see https://youtrack.jetbrains.com/issue/KT-14988
if (!JavaVersion.current().java9Compatible) {
apply plugin: "kotlin"
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
apply plugin: "kotlin"
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
}
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
}
configurations.all {
@ -594,11 +591,6 @@ project("spring-messaging") {
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
}
if (JavaVersion.current().java9Compatible) {
// Reactor2TcpClient's use of Netty requires access to sun.nio.ch.SelectorImpl
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
}
}
project("spring-tx") {
@ -776,11 +768,6 @@ project("spring-web") {
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
}
if (JavaVersion.current().java9Compatible) {
// Netty4ClientHttpRequestFactory requires access to sun.nio.ch.SelectorImpl
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
}
}
project("spring-webflux") {
@ -842,11 +829,6 @@ project("spring-webflux") {
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("org.synchronoss.cloud:nio-multipart-parser:${niomultipartVersion}")
}
if (JavaVersion.current().java9Compatible) {
// ReactorClientHttpConnector requires access to sun.nio.ch.SelectorImpl
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
}
}
project("spring-orm") {
@ -1002,13 +984,6 @@ project("spring-websocket") {
testCompile("io.projectreactor.ipc:reactor-netty")
testCompile("io.netty:netty-all")
}
if (JavaVersion.current().java9Compatible) {
// JAXB requires java.util.logging
test.jvmArgs(["--add-modules", "java.logging"])
// ReactorNettyTcpClient's use of Netty requires access to sun.nio.ch.SelectorImpl
test.jvmArgs(["--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"])
}
}
project("spring-test") {