Clean and fix new scripting API

2018-07-13 19:05:37 +02:00
parent f2a8e5c248
commit a54675abe7
20 changed files with 111 additions and 95 deletions
@@ -210,8 +210,8 @@ fun loadDefinitionsFromTemplates(
                template.annotations.firstIsInstanceOrNull<kotlin.script.experimental.annotations.KotlinScript>() != null -> {
                    KotlinScriptDefinitionAdapterFromNewAPI(
                        ScriptDefinitionFromAnnotatedBaseClass(
+                            KotlinType(template),
                            ScriptingEnvironment(
-                                ScriptingEnvironmentProperties.baseClass to KotlinType(template),
                                ScriptingEnvironmentProperties.configurationDependencies to listOf(JvmDependency(classpath)),
                                ScriptingEnvironmentProperties.getScriptingClass to JvmGetScriptingClass()
                            )