@@ -99,7 +99,7 @@ private class CompilationEnvironment(
99
99
addJvmClasspathRoots(classPath.map { it.toFile() })
100
100
101
101
// Setup script templates (e.g. used by Gradle's Kotlin DSL)
102
- var scriptDefinitions: List <ScriptDefinition > = listOf (ScriptDefinition .getDefault(defaultJvmScriptingHostConfiguration))
102
+ val scriptDefinitions: MutableList <ScriptDefinition > = mutableListOf (ScriptDefinition .getDefault(defaultJvmScriptingHostConfiguration))
103
103
104
104
if (classPath.any { GRADLE_DSL_DEPENDENCY_PATTERN .matches(it.fileName.toString()) }) {
105
105
LOG .info(" Configuring Kotlin DSL script templates..." )
@@ -122,7 +122,7 @@ private class CompilationEnvironment(
122
122
// of KotlinScriptDefinition.dependencyResolver
123
123
// TODO: Use ScriptDefinition.FromLegacyTemplate directly if possible
124
124
// scriptDefinitions = scriptTemplates.map { ScriptDefinition.FromLegacyTemplate(scriptHostConfig, scriptClassLoader.loadClass(it).kotlin) }
125
- scriptDefinitions = scriptTemplates.map { ScriptDefinition .FromLegacy (scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate (
125
+ scriptDefinitions.addAll( scriptTemplates.map { ScriptDefinition .FromLegacy (scriptHostConfig, object : KotlinScriptDefinitionFromAnnotatedTemplate (
126
126
scriptClassLoader.loadClass(it).kotlin,
127
127
scriptHostConfig[ScriptingHostConfiguration .getEnvironment]?.invoke()
128
128
) {
@@ -131,7 +131,7 @@ private class CompilationEnvironment(
131
131
imports = listOf (" org.gradle.kotlin.dsl.*" )
132
132
))
133
133
}
134
- }) }
134
+ }) })
135
135
} catch (e: Exception ) {
136
136
LOG .error(" Error while loading script template classes" )
137
137
LOG .printStackTrace(e)
@@ -280,7 +280,7 @@ class Compiler(classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet(
280
280
fun compileFiles (files : Collection <KtFile >, sourcePath : Collection <KtFile >, kind : CompilationKind = CompilationKind .DEFAULT ): Pair <BindingContext , ComponentProvider > {
281
281
if (kind == CompilationKind .BUILD_SCRIPT ) {
282
282
// Print the (legacy) script template used by the compiled Kotlin DSL build file
283
- files.forEach { LOG .info( " $it -> ScriptDefinition: ${it.findScriptDefinition()?.asLegacyOrNull<KotlinScriptDefinition >()?.template?.simpleName} " ) }
283
+ files.forEach { LOG .debug { " $it -> ScriptDefinition: ${it.findScriptDefinition()?.asLegacyOrNull<KotlinScriptDefinition >()?.template?.simpleName} " } }
284
284
}
285
285
286
286
compileLock.withLock {
0 commit comments