From 307fdd102408a3bfc0d1e99ba9385724240c54a5 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Thu, 23 Mar 2017 12:57:54 +0300 Subject: [PATCH] KT-16762 Maven: JS compiler option main is missing --- .../org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt | 1 + .../java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt index c6b7b6b73f6..6c0dd6a8741 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt @@ -129,6 +129,7 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_ arguments.outputFile = configuration.getChild("outputFile")?.text arguments.metaInfo = configuration.getChild("metaInfo")?.text?.trim()?.toBoolean() ?: false arguments.moduleKind = configuration.getChild("moduleKind")?.text + arguments.main = configuration.getChild("main")?.text } } diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index 56724002cd7..98ce7f21b45 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java @@ -69,6 +69,12 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBaseCALL and NO_CALL. + */ + @Parameter + private String main; + /** *

Specifies which JS module system to generate compatible sources for. Options are:

*