From af5fbef4eab408db4c763387935eef808d746145 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 21 Mar 2017 12:14:27 +0300
Subject: [PATCH] Use JDK 1.6 to compile modules under "core"

Outputs of these modules go into kotlin-stdlib and kotlin-reflect, both
of which must be usable on Java 6
---
 core/builtins/builtins.iml                             | 2 +-
 core/descriptor.loader.java/descriptor.loader.java.iml | 2 +-
 core/descriptors.runtime/descriptors.runtime.iml       | 2 +-
 core/descriptors/descriptors.iml                       | 2 +-
 core/deserialization/deserialization.iml               | 2 +-
 core/reflection.jvm/reflection.jvm.iml                 | 2 +-
 core/runtime.jvm/runtime.jvm.iml                       | 2 +-
 core/script.runtime/script.runtime.iml                 | 2 +-
 core/util.runtime/util.runtime.iml                     | 5 ++---
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/builtins/builtins.iml b/core/builtins/builtins.iml
index c90834f2d60..a0b1f9f1895 100644
--- a/core/builtins/builtins.iml
+++ b/core/builtins/builtins.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index 4e857a22011..a8a8a766e01 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
diff --git a/core/descriptors.runtime/descriptors.runtime.iml b/core/descriptors.runtime/descriptors.runtime.iml
index eed083cae52..80978078587 100644
--- a/core/descriptors.runtime/descriptors.runtime.iml
+++ b/core/descriptors.runtime/descriptors.runtime.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml
index 0205852dc9e..6ad1613764c 100644
--- a/core/descriptors/descriptors.iml
+++ b/core/descriptors/descriptors.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="RUNTIME" name="builtins" level="project" />
     <orderEntry type="module" module-name="deserialization" exported="" />
diff --git a/core/deserialization/deserialization.iml b/core/deserialization/deserialization.iml
index ec411166fe2..6ec426f69b4 100644
--- a/core/deserialization/deserialization.iml
+++ b/core/deserialization/deserialization.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="protobuf-java" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
diff --git a/core/reflection.jvm/reflection.jvm.iml b/core/reflection.jvm/reflection.jvm.iml
index 896b733266b..73f4dacbda7 100644
--- a/core/reflection.jvm/reflection.jvm.iml
+++ b/core/reflection.jvm/reflection.jvm.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="builtins" />
     <orderEntry type="module" module-name="runtime.jvm" />
diff --git a/core/runtime.jvm/runtime.jvm.iml b/core/runtime.jvm/runtime.jvm.iml
index 7ce21791fb6..bc71bb10774 100644
--- a/core/runtime.jvm/runtime.jvm.iml
+++ b/core/runtime.jvm/runtime.jvm.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="builtins" />
   </component>
diff --git a/core/script.runtime/script.runtime.iml b/core/script.runtime/script.runtime.iml
index 7ce21791fb6..bc71bb10774 100644
--- a/core/script.runtime/script.runtime.iml
+++ b/core/script.runtime/script.runtime.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="builtins" />
   </component>
diff --git a/core/util.runtime/util.runtime.iml b/core/util.runtime/util.runtime.iml
index 41523570756..f1f19e59f74 100644
--- a/core/util.runtime/util.runtime.iml
+++ b/core/util.runtime/util.runtime.iml
@@ -5,9 +5,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file