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.4-eap-77 

This commit also fixes compilation with JDK9 since
KT-18832 has been fixed.

Issue: SPR-15814
This commit is contained in:
Sebastien Deleuze 2017-08-14 11:26:38 +02:00
parent 631b546d1c
commit 0bdd246763
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlinVersion = '1.1.4-eap-33' ext.kotlinVersion = '1.1.4-eap-77'
repositories { repositories {
maven { url "https://repo.spring.io/plugins-release" } maven { url "https://repo.spring.io/plugins-release" }
maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
@ -113,12 +113,12 @@ configure(allprojects) { project ->
apply plugin: "kotlin" apply plugin: "kotlin"
compileKotlin { compileKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xload-jsr305-annotations"] kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305-annotations=enable"]
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xload-jsr305-annotations"] kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xjsr305-annotations=enable"]
} }
configurations.all { configurations.all {