Move scripting configuration into compiler plugin

libraries/tools/kotlin-gradle-plugin/build.gradle

@@ -58,6 +58,7 @@ dependencies {
     runtime project(path: ':kotlin-compiler-runner', configuration: 'runtimeJar')
     runtime project(':kotlin-reflect')
     runtime project(':kotlin-scripting-common')
+    runtime project(':kotlin-scripting-compiler-plugin')
     runtime project(':kotlin-scripting-jvm')
 
     // com.android.tools.build:gradle has ~50 unneeded transitive dependencies

libraries/tools/kotlin-maven-plugin/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>kotlin-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-scripting-compiler-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>

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

@@ -49,6 +49,7 @@ 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.ScriptingCompilerConfigurationExtensionKt;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.File;
@@ -183,9 +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);
 
-            K2JVMCompiler.Companion.configureScriptDefinitions(
-                    scriptTemplates.toArray(new String[scriptTemplates.size()]),
-                    configuration, messageCollector, new HashMap<>()
+            ScriptingCompilerConfigurationExtensionKt.configureScriptDefinitions(
+                    scriptTemplates, configuration, messageCollector, new HashMap<>()
             );
 
             KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);