chore(deps): update kotlin to v1.3.20

apache · Jan 25, 2019 · e7427c7 · e7427c7
1 parent f56f04a
commit e7427c7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/contributing.adoc b/contributing.adoc
@@ -72,16 +72,6 @@ make dep
 
 The `make dep` command runs `dep ensure -v` under the hood, so make sure that `dep` is properly installed.
 
-For now, you have to set environment variable `KOTLIN_JDK_HOME` pointing to your JDK (not JRE) home directory.
-Also ensure, that you are using a Java version 8.
-
-For Mac you can just do a
-
-[source, bash]
-----
-export KOTLIN_JDK_HOME=$(/usr/libexec/java_home -v 1.8)
-----
-
 To build the whole project you now need to run:
 
 ```

diff --git a/...me/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt b/...me/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
@@ -54,22 +54,13 @@ class KotlinRoutesLoader : RoutesLoader {
                 val compiler = JvmScriptCompiler()
                 val evaluator = BasicJvmScriptEvaluator()
                 val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator)
-                val javaHome = System.getenv("KOTLIN_JDK_HOME") ?: "/usr/lib/jvm/java"
-
-                LOGGER.info("JAVA_HOME is set to {}", javaHome)
 
                 URIResolver.resolve(context, source).use { `is` ->
                     val result = host.eval(
                         InputStreamReader(`is`).readText().toScriptSource(),
                         ScriptCompilationConfiguration {
                             baseClass(IntegrationConfiguration::class)
                             jvm {
-                                //
-                                // This is needed as workaround for:
-                                //     https://youtrack.jetbrains.com/issue/KT-27497
-                                //
-                                javaHome(File(javaHome))
-
                                 //
                                 // The Kotlin script compiler does not inherit
                                 // the classpath by default

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -39,7 +39,7 @@
         <log4j2.version>2.11.1</log4j2.version>
         <slf4j.version>1.7.25</slf4j.version>
         <groovy.version>2.5.5</groovy.version>
-        <kotlin.version>1.3.11</kotlin.version>
+        <kotlin.version>1.3.20</kotlin.version>
         <snakeyaml.version>1.23</snakeyaml.version>
         <spock.version>1.2-groovy-2.5</spock.version>
         <jackson.version>2.9.8</jackson.version>

diff --git a/script/travis_build.sh b/script/travis_build.sh
@@ -2,9 +2,8 @@
 
 set -e
 
-# Find the JAVA_HOME and set the KOTLIN_JDK_HOME
+# Print JAVA_HOME
 echo "Java home: $JAVA_HOME"
-export KOTLIN_JDK_HOME=$JAVA_HOME
 
 # First build the whole project
 make