From 66107d430ef108825751f2dc102b0008479363ae Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 8 Feb 2019 11:45:31 +0100 Subject: [PATCH] Fix maven plugin after moving scripting to the compiler plugin --- .../org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java index 81185396229..92c3d300fc6 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java @@ -42,12 +42,14 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot; import org.jetbrains.kotlin.codegen.GeneratedClassLoader; import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtScript; import org.jetbrains.kotlin.script.ReflectionUtilKt; +import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar; import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationExtensionKt; import java.io.File; @@ -166,6 +168,9 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo { configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector); + configuration.add(ComponentRegistrar.Companion.getPLUGIN_COMPONENT_REGISTRARS(), + new ScriptingCompilerConfigurationComponentRegistrar()); + List deps = new ArrayList<>(); deps.addAll(getDependenciesForScript());