@@ -6,7 +6,7 @@ buildscript {
6
6
dependencies {
7
7
classpath(" io.spring.gradle:propdeps-plugin:0.0.8" )
8
8
classpath(" org.asciidoctor:asciidoctor-gradle-plugin:1.5.3" )
9
- classpath(" org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-beta-38 " )
9
+ classpath(" org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-rc-91 " )
10
10
classpath(" io.spring.gradle:docbook-reference-plugin:0.3.1" )
11
11
classpath(" io.spring.gradle:dependency-management-plugin:1.0.0.BUILD-SNAPSHOT" )
12
12
}
@@ -71,7 +71,7 @@ configure(allprojects) { project ->
71
71
ext. junitVersion = " 4.12"
72
72
ext. junitJupiterVersion = ' 5.0.0-M3'
73
73
ext. junitPlatformVersion = ' 1.0.0-M3'
74
- ext. kotlinVersion = " 1.1.0-beta-38 " // also change kotlin-gradle-plugin version when upgrading
74
+ ext. kotlinVersion = " 1.1.0-rc-91 " // also change kotlin-gradle-plugin version when upgrading
75
75
ext. log4jVersion = ' 2.8'
76
76
ext. nettyVersion = " 4.1.8.Final"
77
77
ext. okhttpVersion = " 2.7.5"
@@ -110,6 +110,12 @@ configure(allprojects) { project ->
110
110
// Kotlin compiler does not support JDK 9 yet, see https://youtrack.jetbrains.com/issue/KT-14988
111
111
if (! JavaVersion . current(). java9Compatible) {
112
112
apply plugin : " kotlin"
113
+ compileKotlin {
114
+ kotlinOptions. jvmTarget = " 1.8"
115
+ }
116
+ compileTestKotlin {
117
+ kotlinOptions. jvmTarget = " 1.8"
118
+ }
113
119
}
114
120
115
121
configurations {
@@ -403,7 +409,7 @@ project("spring-core") {
403
409
optional(" net.sf.jopt-simple:jopt-simple:5.0.3" )
404
410
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
405
411
optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
406
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
412
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
407
413
optional(" org.reactivestreams:reactive-streams" )
408
414
optional(" io.projectreactor:reactor-core" )
409
415
optional " io.reactivex:rxjava:${ rxjavaVersion} "
@@ -441,7 +447,7 @@ project("spring-beans") {
441
447
compile(files(project(" :spring-core" ). cglibRepackJar))
442
448
optional(" javax.inject:javax.inject:1" )
443
449
optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
444
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
450
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
445
451
optional(" org.yaml:snakeyaml:${ snakeyamlVersion} " )
446
452
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
447
453
}
@@ -536,7 +542,7 @@ project("spring-context") {
536
542
optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
537
543
optional(" org.codehaus.groovy:groovy-all:${ groovyVersion} " )
538
544
optional(" org.beanshell:bsh:2.0b5" )
539
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
545
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
540
546
testCompile(" org.apache.commons:commons-pool2:2.4.2" )
541
547
testCompile(" org.slf4j:slf4j-api:${ slf4jVersion} " )
542
548
testCompile(" javax.inject:javax.inject-tck:1" )
@@ -614,7 +620,7 @@ project("spring-messaging") {
614
620
testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
615
621
testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
616
622
testCompile(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
617
- testCompile(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
623
+ testCompile(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
618
624
testRuntime(" javax.activation:activation:${ activationApiVersion} " )
619
625
testRuntime(" com.sun.xml.bind:jaxb-core:${ jaxbVersion} " )
620
626
testRuntime(" com.sun.xml.bind:jaxb-impl:${ jaxbVersion} " )
@@ -678,7 +684,7 @@ project("spring-jdbc") {
678
684
optional(" org.apache.derby:derby:10.13.1.1" )
679
685
optional(" org.apache.derby:derbyclient:10.13.1.1" )
680
686
optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
681
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
687
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
682
688
}
683
689
}
684
690
@@ -780,7 +786,7 @@ project("spring-web") {
780
786
optional(" javax.xml.bind:jaxb-api:${ jaxbVersion} " )
781
787
optional(" javax.xml.ws:jaxws-api:${ jaxwsVersion} " )
782
788
optional(" javax.mail:javax.mail-api:${ javamailVersion} " )
783
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
789
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
784
790
testCompile(project(" :spring-context-support" )) // for JafMediaTypeFactory
785
791
testCompile(" io.projectreactor.addons:reactor-test" )
786
792
testCompile(" org.apache.taglibs:taglibs-standard-jstlel:1.2.1" ) {
@@ -843,7 +849,7 @@ project("spring-webflux") {
843
849
exclude group : " org.jboss.spec.javax.websocket" , module : " jboss-websocket-api_1.1_spec"
844
850
}
845
851
optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
846
- optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
852
+ optional(" org.jetbrains.kotlin:kotlin-stdlib-jre8 :${ kotlinVersion} " )
847
853
testCompile(" io.projectreactor.addons:reactor-test" )
848
854
testCompile(" javax.validation:validation-api:${ beanvalVersion} " )
849
855
testCompile(" org.hibernate:hibernate-validator:${ hibval5Version} " )
0 commit comments