From 97faff246d5b4e3e338e20895cddf69170fa445a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 6 Aug 2018 19:42:02 +0200
Subject: [PATCH] Compile kotlinx-metadata-jvm with JVM target 1.6 instead of
 1.8

 #KT-25920 Fixed
---
 libraries/kotlinx-metadata/build.gradle.kts     | 3 +++
 libraries/kotlinx-metadata/jvm/ChangeLog.md     | 1 +
 libraries/kotlinx-metadata/jvm/build.gradle.kts | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/libraries/kotlinx-metadata/build.gradle.kts b/libraries/kotlinx-metadata/build.gradle.kts
index b02daac8671..88607ddffca 100644
--- a/libraries/kotlinx-metadata/build.gradle.kts
+++ b/libraries/kotlinx-metadata/build.gradle.kts
@@ -4,6 +4,9 @@ plugins {
     kotlin("jvm")
 }
 
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
 sourceSets {
     "main" { projectDefault() }
     "test" { }
diff --git a/libraries/kotlinx-metadata/jvm/ChangeLog.md b/libraries/kotlinx-metadata/jvm/ChangeLog.md
index 559400f9251..8d49c3ca9fc 100644
--- a/libraries/kotlinx-metadata/jvm/ChangeLog.md
+++ b/libraries/kotlinx-metadata/jvm/ChangeLog.md
@@ -2,6 +2,7 @@
 
 ## 0.0.4
 
+- [`KT-25920`](https://youtrack.jetbrains.com/issue/KT-25920) Compile kotlinx-metadata-jvm with JVM target bytecode version 1.6 instead of 1.8
 - [`KT-25223`](https://youtrack.jetbrains.com/issue/KT-25223) Add JvmFunctionExtensionVisitor.visitEnd
 
 ## 0.0.3
diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts
index e631de46a20..329d23a7556 100644
--- a/libraries/kotlinx-metadata/jvm/build.gradle.kts
+++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts
@@ -20,6 +20,9 @@ group = "org.jetbrains.kotlinx"
 val deployVersion = findProperty("kotlinxMetadataDeployVersion") as String?
 version = deployVersion ?: "0.1-SNAPSHOT"
 
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
 sourceSets {
     "main" { projectDefault() }
     "test" { projectDefault() }