Fix dependencies for Olive, add tests for basic scripting

2020-04-11 11:03:20 +02:00
parent 8c591c4830
commit a0fd51c3c2
4 changed files with 54 additions and 10 deletions
--- a/orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt
+++ b/orx-olive/src/main/kotlin/ScriptObjectLoaderKSH.kt
@@ -30,6 +30,20 @@ fun <T> loadFromScriptKSH(
            }

        }
-): T = (evalScriptWithConfiguration(script.readText(), host, body).valueOrThrow().returnValue as ResultValue.Value).value as T
+): T = loadFromScriptKSH(script.readText(), host, body)
+
+@Suppress("UNCHECKED_CAST")
+fun <T> loadFromScriptKSH(
+        script: String,
+        host: BasicScriptingHost = BasicJvmScriptingHost(),
+        body: ScriptCompilationConfiguration.Builder.() -> Unit = {
+
+            jvm {
+                dependenciesFromCurrentContext(wholeClasspath = true)
+            }
+
+        }
+): T = (evalScriptWithConfiguration(script, host, body).valueOrThrow().returnValue as ResultValue.Value).value as T
+