From ea510704461e5e9f56afc4ded880199514368c02 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 11 Oct 2016 23:23:10 +0300
Subject: [PATCH] Refactor: make languageVersion configuration parameter common
 for jvm and js kotlin maven compiler plugin.

---
 .../java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java    | 4 ----
 .../org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java    | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
index 84b8f1350f8..59af6712e19 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
@@ -56,9 +56,6 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
     @Parameter(defaultValue = "${project.artifactId}-test", required = true, readonly = true)
     protected String testModuleName;
 
-    @Parameter(property = "kotlin.compiler.languageVersion", required = false, readonly = false)
-    protected String languageVersion;
-
     @Parameter(property = "kotlin.compiler.jvmTarget", required = false, readonly = false)
     protected String jvmTarget;
 
@@ -110,7 +107,6 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
             getLog().info("Optimization is turned off");
         }
 
-        arguments.languageVersion = languageVersion;
         arguments.jvmTarget = jvmTarget;
 
         if (jdkHome != null) {
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 f77427a5317..b2bc42c9eed 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
@@ -110,6 +110,10 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
     @Parameter
     public String testModule;
 
+
+    @Parameter(property = "kotlin.compiler.languageVersion", required = false, readonly = false)
+    protected String languageVersion;
+
     /**
      * Additional command line arguments for Kotlin compiler.
      */
@@ -217,6 +221,7 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
         }
 
         arguments.suppressWarnings = nowarn;
+        arguments.languageVersion = languageVersion;
 
         getLog().info("Compiling Kotlin sources from " + sources);