Pass scripting (host) environment independently from properties/configuration

2018-07-15 22:23:49 +02:00
parent 91e6c0b77c
commit 8953bba47c
11 changed files with 49 additions and 43 deletions
@@ -208,14 +208,13 @@ fun loadDefinitionsFromTemplates(
                    )
                }
                template.annotations.firstIsInstanceOrNull<kotlin.script.experimental.annotations.KotlinScript>() != null -> {
+                    val hostEnvironment = ScriptingEnvironment(
+                        ScriptingEnvironmentProperties.configurationDependencies to listOf(JvmDependency(classpath)),
+                        ScriptingEnvironmentProperties.getScriptingClass to JvmGetScriptingClass()
+                    )
                    KotlinScriptDefinitionAdapterFromNewAPI(
-                        ScriptDefinitionFromAnnotatedBaseClass(
-                            KotlinType(template),
-                            ScriptingEnvironment(
-                                ScriptingEnvironmentProperties.configurationDependencies to listOf(JvmDependency(classpath)),
-                                ScriptingEnvironmentProperties.getScriptingClass to JvmGetScriptingClass()
-                            )
-                        )
+                        ScriptDefinitionFromAnnotatedBaseClass(KotlinType(template), hostEnvironment),
+                        hostEnvironment
                    )
                }
                else -> {