@@ -121,17 +121,17 @@ private class CompilationEnvironment(
121
121
// ScriptDefinition.compilationConfiguration and its defaultImports instead
122
122
// of KotlinScriptDefinition.dependencyResolver
123
123
// TODO: Use ScriptDefinition.FromLegacyTemplate directly if possible
124
- scriptDefinitions = scriptTemplates.map { ScriptDefinition .FromLegacyTemplate (scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125
- // scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacy(scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate(
126
- // scriptClassLoader.loadClass(it).kotlin,
127
- // scriptHostConfig[ScriptingHostConfiguration.getEnvironment]?.invoke()
128
- // ) {
129
- // override val dependencyResolver: DependenciesResolver = object : DependenciesResolver {
130
- // override fun resolve(scriptContents: ScriptContents, environment: Environment) = ResolveResult.Success(ScriptDependencies(
131
- // imports = listOf("org.gradle.kotlin.api .*")
132
- // ))
133
- // }
134
- // }) }
124
+ // scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacyTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125
+ scriptDefinitions = scriptTemplates.map { ScriptDefinition .FromLegacy (scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate (
126
+ scriptClassLoader.loadClass(it).kotlin,
127
+ scriptHostConfig[ScriptingHostConfiguration .getEnvironment]?.invoke()
128
+ ) {
129
+ override val dependencyResolver: DependenciesResolver = object : DependenciesResolver {
130
+ override fun resolve (scriptContents : ScriptContents , environment : Environment ) = ResolveResult .Success (ScriptDependencies (
131
+ imports = listOf (" org.gradle.kotlin.dsl .*" )
132
+ ))
133
+ }
134
+ }) }
135
135
} catch (e: Exception ) {
136
136
LOG .error(" Error while loading script template classes" )
137
137
LOG .printStackTrace(e)
0 commit comments