From e5d64d316d6fb8281f73d80d2a6490bdb951e014 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 26 May 2016 14:14:17 +0300 Subject: [PATCH] Fix kotlin-maven-plugin compilation --- .../jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 a7bb8306f31..22067b19c19 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 @@ -166,16 +166,16 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo { for (File item: deps) { if (item.exists()) { - configuration.add(CommonConfigurationKeys.CONTENT_ROOTS, new JvmClasspathRoot(item)); + configuration.add(JVMConfigurationKeys.CONTENT_ROOTS, new JvmClasspathRoot(item)); getLog().debug("Adding to classpath: " + item.getAbsolutePath()); } else { getLog().debug("Skipping non-existing dependency: " + item.getAbsolutePath()); } } - configuration.add(CommonConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(scriptFile.getAbsolutePath())); - configuration.put(JVMConfigurationKeys.MODULE_NAME, JvmAbi.DEFAULT_MODULE_NAME); - configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition.INSTANCE); + 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); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);