Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update kotlin to v1.3.20 #367

Merged
merged 1 commit into from
Jan 25, 2019
Merged

chore(deps): update kotlin to v1.3.20 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions contributing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

```
Expand Down
9 changes: 0 additions & 9 deletions ...me/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions script/travis_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down