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

Upgrade to Kotlin 1.1.3 

This commit also enables Kotlin build with JDK 9 since this new
version supports it.
This commit is contained in:
Sebastien Deleuze 2017-06-24 01:13:22 +02:00
parent 97390fd939
commit d57cd37266
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.gradle
View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlinVersion = '1.1.2-5' ext.kotlinVersion = '1.1.3'
repositories { repositories {
maven { url "https://repo.spring.io/plugins-release" } maven { url "https://repo.spring.io/plugins-release" }
} }
@ -109,17 +109,15 @@ configure(allprojects) { project ->
apply from: "${gradleScriptDir}/ide.gradle" apply from: "${gradleScriptDir}/ide.gradle"
apply from: "${gradleScriptDir}/sniffer.gradle" apply from: "${gradleScriptDir}/sniffer.gradle"
if(!JavaVersion.current().java9Compatible) { apply plugin: "kotlin"
apply plugin: "kotlin" compileKotlin {
compileKotlin { kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "1.8" kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"] kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"]
}
} }
configurations.all { configurations.all {