From ea2e0bdc3ffd91661bd7dca599448dfda0b76925 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 20 Apr 2023 17:31:48 +0200 Subject: [PATCH] Fix maven script executor after changes in the jdk path processing also avoid unnecessary warnign about scripts in source roots #KT-58101 fixed --- .../org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java | 6 ++++++ 1 file changed, 6 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 a1ed05a16d36f..97769f87a2851 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 @@ -62,6 +62,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.jetbrains.kotlin.cli.jvm.JvmArgumentsKt.configureJdkHomeFromSystemProperty; + /** * Allows to execute kotlin script files during the build process. * You can specify script file or inline script to be executed. @@ -173,6 +175,10 @@ private void executeScriptFile(File scriptFile) throws MojoExecutionException { configuration.add(ComponentRegistrar.Companion.getPLUGIN_COMPONENT_REGISTRARS(), new ScriptingCompilerConfigurationComponentRegistrar()); + configureJdkHomeFromSystemProperty(configuration); + + configuration.put(CommonConfigurationKeys.ALLOW_ANY_SCRIPTS_IN_SOURCE_ROOTS, true); + List deps = new ArrayList<>(); deps.addAll(getDependenciesForScript());