From 3f3a3820b83afe90f70fa2575d0f0dc46a357662 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 20 Jun 2016 21:55:24 +0300
Subject: [PATCH] Maven: support jvmTarget parameter in Maven, linked to
 property kotlin.compiler.jvmTarget. Gradle: support jvmTarget compiler
 option.

---
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt   | 1 +
 .../java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index eff94ca6a9c..0b99a0075d6 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -202,6 +202,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
         args.noParamAssertions = kotlinOptions.noParamAssertions
         args.moduleName = kotlinOptions.moduleName ?: extraProperties.getOrNull<String>("defaultModuleName")
         args.languageVersion = kotlinOptions.languageVersion
+        args.jvmTarget = kotlinOptions.jvmTarget
 
         fun addFriendPathForTestTask(taskName: String) {
             logger.kotlinDebug("try to determine the output directory of corresponding $taskName task")
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 8a93f2ee2e3..54bf49ceec0 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
@@ -61,6 +61,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
     @Parameter(defaultValue = "${project.artifactId}-test", required = true, readonly = true)
     protected String testModuleName;
 
+    @Parameter(property = "kotlin.compiler.jvmTarget", required = false, readonly = false)
+    protected String jvmTarget;
+
     @NotNull
     @Override
     protected K2JVMCompiler createCompiler() {
@@ -102,5 +105,7 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
         if (arguments.noOptimize) {
             getLog().info("Optimization is turned off");
         }
+
+        arguments.jvmTarget = jvmTarget;
     }
 }