Add support for custom script compilation and execution to maven plugin, add simple test, relevant refactorings on the compiler side

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java

@@ -35,6 +35,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.repository.ComponentDependency;
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys;
+import org.jetbrains.kotlin.cli.common.ReflectionUtilKt;
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -49,16 +50,14 @@ import org.jetbrains.kotlin.config.KotlinSourceRoot;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtScript;
-import org.jetbrains.kotlin.script.StandardScriptDefinition;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -108,6 +107,15 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
     @Parameter(defaultValue = "${localRepository}", required = true, readonly = true)
     private ArtifactRepository localRepository;
 
+    @Parameter(property = "kotlin.compiler.scriptTemplates", required = false, readonly = false)
+    protected List<String> scriptTemplates;
+
+    @Parameter(property = "kotlin.compiler.scriptArguments", required = false, readonly = false)
+    protected List<String> scriptArguments;
+
+    @Parameter(property = "kotlin.compiler.scriptClasspath", required = false, readonly = false)
+    protected List<String> scriptClasspath;
+
     @Component
     private ArtifactHandlerManager artifactHandlerManager;
 
@@ -176,7 +184,8 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
 
             configuration.add(JVMConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(scriptFile.getAbsolutePath()));
             configuration.put(CommonConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME);
-            configuration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, StandardScriptDefinition.INSTANCE);
+
+            K2JVMCompiler.Companion.configureScriptDefinitions(scriptTemplates.toArray(new String[scriptTemplates.size()]), configuration, messageCollector, new HashMap<String, Object>());
 
             KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
 
@@ -192,17 +201,9 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
 
             try {
                 Class<?> klass = classLoader.loadClass(nameForScript.asString());
-                Constructor<?> constructor = klass.getConstructor(String[].class);
                 ExecuteKotlinScriptMojo.INSTANCE = this;
-                constructor.newInstance(new Object[]{new String[]{}});
-            } catch (InstantiationException e) {
-                throw new ScriptExecutionException(scriptFile, "internal error", e);
-            } catch (InvocationTargetException e) {
-                throw new ScriptExecutionException(scriptFile, "script threw an exception", e.getCause());
-            } catch (NoSuchMethodException e) {
-                throw new ScriptExecutionException(scriptFile, "internal error", e);
-            } catch (IllegalAccessException e) {
-                throw new ScriptExecutionException(scriptFile, "internal error", e);
+                if (ReflectionUtilKt.tryConstructScriptClass(klass, scriptArguments) == null)
+                    throw new ScriptExecutionException(scriptFile, "unable to construct script");
             } catch (ClassNotFoundException e) {
                 throw new ScriptExecutionException(scriptFile, "internal error", e);
             }
@@ -221,6 +222,10 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
 
         deps.addAll(getThisPluginDependencies());
 
+        for (String cp: scriptClasspath) {
+            deps.add(new File(cp));
+        }
+
         return deps;
     }
 

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java

@@ -65,6 +65,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
     @Parameter(property = "kotlin.compiler.jdkHome", required = false, readonly = false)
     protected String jdkHome;
 
+    @Parameter(property = "kotlin.compiler.scriptTemplates", required = false, readonly = false)
+    protected List<String> scriptTemplates;
+
     @NotNull
     @Override
     protected K2JVMCompiler createCompiler() {
@@ -114,5 +117,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
             getLog().info("Overriding JDK home path with: " + jdkHome);
             arguments.jdkHome = jdkHome;
         }
+
+        if (scriptTemplates != null && !scriptTemplates.isEmpty()) {
+            arguments.scriptTemplates = scriptTemplates.toArray(new String[0]);
+        }
     }
 }