Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.1.0-beta-38

Browse Source
This commit is contained in:
Sebastien Deleuze
2017-02-03 00:33:04 +01:00
parent 654e14a86a
commit 02c4aff4ce
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -6,7 +6,7 @@ buildscript {
dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-beta-17")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-beta-38")
classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
classpath("io.spring.gradle:dependency-management-plugin:1.0.0.BUILD-SNAPSHOT")
}
@@ -71,7 +71,7 @@ configure(allprojects) { project ->
ext.junitVersion = "4.12"
ext.junitJupiterVersion = '5.0.0-M3'
ext.junitPlatformVersion = '1.0.0-M3'
ext.kotlinVersion = "1.1.0-beta-17" // also change kotlin-gradle-plugin version when upgrading
ext.kotlinVersion = "1.1.0-beta-38" // also change kotlin-gradle-plugin version when upgrading
ext.log4jVersion = '2.8'
ext.nettyVersion = "4.1.8.Final"
ext.okhttpVersion = "2.7.5"

4
spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/render.kts
View File

@@ -3,7 +3,6 @@ import org.springframework.web.reactive.result.view.script.RenderingContext
import org.springframework.context.support.ResourceBundleMessageSource
import org.springframework.beans.factory.getBean
// TODO Use engine.eval(String, Bindings) when https://youtrack.jetbrains.com/issue/KT-15450 will be fixed
fun render(template: String, model: Map<String, Any>, renderingContext: RenderingContext): String {
val engine = ScriptEngineManager().getEngineByName("kotlin")
val bindings = SimpleBindings()
@@ -11,7 +10,6 @@ fun render(template: String, model: Map<String, Any>, renderingContext: Renderin
var messageSource = renderingContext.applicationContext.getBean<ResourceBundleMessageSource>()
bindings.put("i18n", { code: String -> messageSource.getMessage(code, null, renderingContext.locale) })
bindings.put("include", { path: String -> renderingContext.templateLoader.apply("org/springframework/web/reactive/result/view/script/kotlin/$path.html") })
engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE)
return engine.eval(template) as String
return engine.eval(template, bindings) as String
}

4
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/render.kts
View File

@@ -3,7 +3,6 @@ import org.springframework.web.servlet.view.script.RenderingContext
import org.springframework.context.support.ResourceBundleMessageSource
import org.springframework.beans.factory.getBean
// TODO Use engine.eval(String, Bindings) when https://youtrack.jetbrains.com/issue/KT-15450 will be fixed
fun render(template: String, model: Map<String, Any>, renderingContext: RenderingContext): String {
val engine = ScriptEngineManager().getEngineByName("kotlin")
val bindings = SimpleBindings()
@@ -11,7 +10,6 @@ fun render(template: String, model: Map<String, Any>, renderingContext: Renderin
var messageSource = renderingContext.applicationContext.getBean<ResourceBundleMessageSource>()
bindings.put("i18n", { code: String -> messageSource.getMessage(code, null, renderingContext.locale) })
bindings.put("include", { path: String -> renderingContext.templateLoader.apply("org/springframework/web/servlet/view/script/kotlin/$path.html") })
engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE)
return engine.eval(template) as String
return engine.eval(template, bindings) as String
}