diff --git a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/pom.xml b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/pom.xml index 1d279ecede0..80ee55276d2 100644 --- a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/pom.xml @@ -70,6 +70,11 @@ + + + off + + diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index 07d07d68813..302e9481deb 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java @@ -33,6 +33,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; +import org.jetbrains.jet.lang.types.lang.InlineUtil; import java.io.File; import java.io.IOException; @@ -149,6 +150,13 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo { */ public String testModule; + /** + * Switch method inlining on/off: possible values are "on" and "off". + * + * @parameter + */ + public String inline; + @Override public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("Kotlin Compiler version " + KotlinVersion.VERSION); @@ -295,6 +303,8 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo { arguments.noJdkAnnotations = true; arguments.annotations = getFullAnnotationsPath(log, annotationPaths); log.info("Using kotlin annotations from " + arguments.annotations); + arguments.enableInline = inline; + log.info("Method inlining is " + InlineUtil.optionToInlineFlag(arguments.enableInline)); } protected String getFullAnnotationsPath(Log log, List annotations) {