diff options
| author | Dmitry Gridin <dmitry.gridin@jetbrains.com> | 2020-08-12 12:59:36 +0700 |
|---|---|---|
| committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-08-12 06:05:02 +0000 |
| commit | d6baf044913801418972ee64d7c94dc95d565a64 (patch) | |
| tree | 7c2a775b88a66425014db0861517c7023fe585d0 | |
| parent | 63122eff1391f22d806e57a638aefb5c6b2d7c76 (diff) | |
| download | intellij-kotlin-d6baf044913801418972ee64d7c94dc95d565a64.tar.gz | |
fix compilation: explicitly set Java 8 language level
GitOrigin-RevId: fcbc8b794676296d739d47a76ec6778ac8a46ad8
57 files changed, 114 insertions, 114 deletions
diff --git a/common/kotlin.common.iml b/common/kotlin.common.iml index a2b0875d4694..29f546ae721c 100644 --- a/common/kotlin.common.iml +++ b/common/kotlin.common.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="Guava" level="project" /> diff --git a/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml b/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml index 9f130eed68d8..7187bc6e7402 100644 --- a/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml +++ b/compiler-plugins/allopen/kotlin.compiler-plugins.allopen.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml b/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml index e383117d10c8..a8e67bde2e3d 100644 --- a/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml +++ b/compiler-plugins/annotation-based-compiler-support/kotlin.compiler-plugins.annotation-based-compiler-support.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml b/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml index 48f31aaaae55..f096c3ee43d3 100644 --- a/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml +++ b/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml b/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml index 1d2abfefe417..05bd8f40ba95 100644 --- a/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml +++ b/compiler-plugins/kotlinx-serialization/kotlin.compiler-plugins.kotlinx-serialization.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml b/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml index 391bea928567..1ac30a0bac00 100644 --- a/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml +++ b/compiler-plugins/noarg/kotlin.compiler-plugins.noarg.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml b/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml index cc607d15769f..e148f63f386b 100644 --- a/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml +++ b/compiler-plugins/sam-with-receiver/kotlin.compiler-plugins.sam-with-receiver.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml b/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml index 5ad291834cf3..860c4be80adb 100644 --- a/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml +++ b/compiler-plugins/scripting-ide-services/kotlin.compiler-plugins.scripting-ide-services.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml b/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml index 8bbdcee4d1c5..8686a84701b8 100644 --- a/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml +++ b/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/completion/kotlin.completion.iml b/completion/kotlin.completion.iml index 2791e18854e1..46f3573e0535 100644 --- a/completion/kotlin.completion.iml +++ b/completion/kotlin.completion.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" /> diff --git a/core/kotlin.core.iml b/core/kotlin.core.iml index 70a9d391412e..9e028325098a 100644 --- a/core/kotlin.core.iml +++ b/core/kotlin.core.iml @@ -14,7 +14,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../analysis"> <sourceFolder url="file://$MODULE_DIR$/../analysis/src" isTestSource="false" /> @@ -24,7 +24,7 @@ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" /> diff --git a/fir-low-level-api/kotlin.fir.fir-low-level-api.iml b/fir-low-level-api/kotlin.fir.fir-low-level-api.iml index 699b888c5bf0..ff35479ea2fc 100644 --- a/fir-low-level-api/kotlin.fir.fir-low-level-api.iml +++ b/fir-low-level-api/kotlin.fir.fir-low-level-api.iml @@ -14,10 +14,10 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/fir/kotlin.fir.iml b/fir/kotlin.fir.iml index abc4921b3d12..086f24e42dfa 100644 --- a/fir/kotlin.fir.iml +++ b/fir/kotlin.fir.iml @@ -14,10 +14,10 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/formatter/kotlin.formatter.iml b/formatter/kotlin.formatter.iml index 64f39247eea7..f1f613a70234 100644 --- a/formatter/kotlin.formatter.iml +++ b/formatter/kotlin.formatter.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="JDOM" level="project" /> diff --git a/frontend-api/kotlin.fir.frontend-api.iml b/frontend-api/kotlin.fir.frontend-api.iml index 84a32828ee67..a47dbad2d118 100644 --- a/frontend-api/kotlin.fir.frontend-api.iml +++ b/frontend-api/kotlin.fir.frontend-api.iml @@ -14,10 +14,10 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/frontend-fir/kotlin.fir.frontend-fir.iml b/frontend-fir/kotlin.fir.frontend-fir.iml index 8b80c1fc3e71..7086a192e456 100644 --- a/frontend-fir/kotlin.fir.frontend-fir.iml +++ b/frontend-fir/kotlin.fir.frontend-fir.iml @@ -14,10 +14,10 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/frontend-independent/kotlin.fir.frontend-independent.iml b/frontend-independent/kotlin.fir.frontend-independent.iml index df16ee47cbb8..4082e7816fe2 100644 --- a/frontend-independent/kotlin.fir.frontend-independent.iml +++ b/frontend-independent/kotlin.fir.frontend-independent.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/generators/kotlin.generators.iml b/generators/kotlin.generators.iml index 3fd4774c0259..14b7c4c58121 100644 --- a/generators/kotlin.generators.iml +++ b/generators/kotlin.generators.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/git/kotlin.git.iml b/git/kotlin.git.iml index 1a4fe9a1591d..299dd1c5a128 100644 --- a/git/kotlin.git.iml +++ b/git/kotlin.git.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="module" module-name="kotlin.idea" /> diff --git a/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml b/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml index b00e79cfef42..c80a320d1dbf 100644 --- a/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml +++ b/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" /> diff --git a/gradle/gradle-native/kotlin.gradle.gradle-native.iml b/gradle/gradle-native/kotlin.gradle.gradle-native.iml index 8ee531275e54..d35b4be7ef47 100644 --- a/gradle/gradle-native/kotlin.gradle.gradle-native.iml +++ b/gradle/gradle-native/kotlin.gradle.gradle-native.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="JUnit4" level="project" /> diff --git a/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml b/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml index 034fda51d9be..feb49d28c079 100644 --- a/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml +++ b/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="module" module-name="intellij.gradle.toolingExtension" /> diff --git a/idea/kotlin.idea.iml b/idea/kotlin.idea.iml index c7672d5c47de..a0dc5e93fa6c 100644 --- a/idea/kotlin.idea.iml +++ b/idea/kotlin.idea.iml @@ -14,7 +14,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../completion"> <sourceFolder url="file://$MODULE_DIR$/../completion/resources" type="java-resource" /> @@ -34,7 +34,7 @@ <content url="file://$MODULE_DIR$/../resources-descriptors"> <sourceFolder url="file://$MODULE_DIR$/../resources-descriptors" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> diff --git a/j2k/idea/kotlin.j2k.idea.iml b/j2k/idea/kotlin.j2k.idea.iml index f4039c0fef38..c39a577b5fcd 100644 --- a/j2k/idea/kotlin.j2k.idea.iml +++ b/j2k/idea/kotlin.j2k.idea.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" /> diff --git a/j2k/kotlin.j2k.iml b/j2k/kotlin.j2k.iml index d6ebd4805981..c528c645c0e2 100644 --- a/j2k/kotlin.j2k.iml +++ b/j2k/kotlin.j2k.iml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module>
\ No newline at end of file diff --git a/j2k/new/kotlin.j2k.new.iml b/j2k/new/kotlin.j2k.new.iml index dbabed2325fa..15988f37852a 100644 --- a/j2k/new/kotlin.j2k.new.iml +++ b/j2k/new/kotlin.j2k.new.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/j2k/old/kotlin.j2k.old.iml b/j2k/old/kotlin.j2k.old.iml index 968d929ea4ff..1b4e9af2878c 100644 --- a/j2k/old/kotlin.j2k.old.iml +++ b/j2k/old/kotlin.j2k.old.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/j2k/services/kotlin.j2k.services.iml b/j2k/services/kotlin.j2k.services.iml index c2ad0c5f43df..93a96ed7a114 100644 --- a/j2k/services/kotlin.j2k.services.iml +++ b/j2k/services/kotlin.j2k.services.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="javaslang" level="project" /> diff --git a/jps/jps-common/kotlin.jps-common.iml b/jps/jps-common/kotlin.jps-common.iml index 654e32936973..9ac0fcbe73d6 100644 --- a/jps/jps-common/kotlin.jps-common.iml +++ b/jps/jps-common/kotlin.jps-common.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/jps/jps-plugin/kotlin.jps-plugin.iml b/jps/jps-plugin/kotlin.jps-plugin.iml index 1b9d1a820b2d..db5bcea16518 100644 --- a/jps/jps-plugin/kotlin.jps-plugin.iml +++ b/jps/jps-plugin/kotlin.jps-plugin.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/jvm-debugger/core/kotlin.jvm-debugger.core.iml index a6da6ea8d378..8b941a0df212 100644 --- a/jvm-debugger/core/kotlin.jvm-debugger.core.iml +++ b/jvm-debugger/core/kotlin.jvm-debugger.core.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="ASM" level="project" /> diff --git a/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml b/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml index 78effbd40b87..edbd46dcbc85 100644 --- a/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml +++ b/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/jvm-debugger/eval4j/kotlin.eval4j.iml b/jvm-debugger/eval4j/kotlin.eval4j.iml index 44e9fcccb205..9dc1b7fdd5a0 100644 --- a/jvm-debugger/eval4j/kotlin.eval4j.iml +++ b/jvm-debugger/eval4j/kotlin.eval4j.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="ASM" level="project" /> diff --git a/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml b/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml index 5c0422c28077..c77d55587f81 100644 --- a/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml +++ b/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="ASM" level="project" /> diff --git a/jvm-debugger/kotlin.jvm-debugger.iml b/jvm-debugger/kotlin.jvm-debugger.iml index d6ebd4805981..c528c645c0e2 100644 --- a/jvm-debugger/kotlin.jvm-debugger.iml +++ b/jvm-debugger/kotlin.jvm-debugger.iml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module>
\ No newline at end of file diff --git a/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml b/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml index a1b77dbc518a..2da467d2aca6 100644 --- a/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml +++ b/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/jvm-debugger/test/kotlin.jvm-debugger.test.iml index 696adfa1df1a..2fdc17982979 100644 --- a/jvm-debugger/test/kotlin.jvm-debugger.test.iml +++ b/jvm-debugger/test/kotlin.jvm-debugger.test.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/jvm-debugger/util/kotlin.jvm-debugger.util.iml b/jvm-debugger/util/kotlin.jvm-debugger.util.iml index 6efc0b899923..7010ba8cd1b5 100644 --- a/jvm-debugger/util/kotlin.jvm-debugger.util.iml +++ b/jvm-debugger/util/kotlin.jvm-debugger.util.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="Log4J" level="project" /> diff --git a/jvm/kotlin.jvm.iml b/jvm/kotlin.jvm.iml index ec6b968a4e3f..d638efe80fc1 100644 --- a/jvm/kotlin.jvm.iml +++ b/jvm/kotlin.jvm.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="Guava" level="project" /> diff --git a/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml b/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml index e1a253974305..d4e140599161 100644 --- a/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml +++ b/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/../../tools/kotlin-compiler-classpath/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="ASM" level="project" /> diff --git a/kotlin.all-tests/kotlin.all-tests.iml b/kotlin.all-tests/kotlin.all-tests.iml index 0e024d9e02a8..b1eb8d347cde 100644 --- a/kotlin.all-tests/kotlin.all-tests.iml +++ b/kotlin.all-tests/kotlin.all-tests.iml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="kotlin.common" /> <orderEntry type="module" module-name="kotlin.compiler-plugins.allopen" /> diff --git a/kotlin.intellij-kotlin.iml b/kotlin.intellij-kotlin.iml index 489856e86344..7d2155b4550a 100644 --- a/kotlin.intellij-kotlin.iml +++ b/kotlin.intellij-kotlin.iml @@ -15,10 +15,10 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module>
\ No newline at end of file diff --git a/line-indent-provider/kotlin.line-indent-provider.iml b/line-indent-provider/kotlin.line-indent-provider.iml index caee6fd80763..5ae0485f7a49 100644 --- a/line-indent-provider/kotlin.line-indent-provider.iml +++ b/line-indent-provider/kotlin.line-indent-provider.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/maven/kotlin.maven.iml b/maven/kotlin.maven.iml index cb217d4038c1..8d046bcb2745 100644 --- a/maven/kotlin.maven.iml +++ b/maven/kotlin.maven.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="gson" level="project" /> diff --git a/native/kotlin.native.iml b/native/kotlin.native.iml index e42a5d793d4e..ef5968396f99 100644 --- a/native/kotlin.native.iml +++ b/native/kotlin.native.iml @@ -14,7 +14,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> @@ -22,7 +22,7 @@ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/performance-tests/kotlin.performance-tests.iml b/performance-tests/kotlin.performance-tests.iml index 52fbe87bb95b..011a94dfba90 100644 --- a/performance-tests/kotlin.performance-tests.iml +++ b/performance-tests/kotlin.performance-tests.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" /> diff --git a/project-wizard/cli/kotlin.project-wizard.cli.iml b/project-wizard/cli/kotlin.project-wizard.cli.iml index 79d4602331bb..b714dfc89c88 100644 --- a/project-wizard/cli/kotlin.project-wizard.cli.iml +++ b/project-wizard/cli/kotlin.project-wizard.cli.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/project-wizard/core/kotlin.project-wizard.core.iml b/project-wizard/core/kotlin.project-wizard.core.iml index 89564bf92ac0..52805467ab11 100644 --- a/project-wizard/core/kotlin.project-wizard.core.iml +++ b/project-wizard/core/kotlin.project-wizard.core.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/project-wizard/idea/kotlin.project-wizard.idea.iml b/project-wizard/idea/kotlin.project-wizard.idea.iml index 215324c4a51d..b04cdf31d131 100644 --- a/project-wizard/idea/kotlin.project-wizard.idea.iml +++ b/project-wizard/idea/kotlin.project-wizard.idea.iml @@ -14,14 +14,14 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinx-collections-immutable-jvm" level="project" /> diff --git a/project-wizard/kotlin.project-wizard.iml b/project-wizard/kotlin.project-wizard.iml index 3f1f895b73ad..42670bc1172d 100644 --- a/project-wizard/kotlin.project-wizard.iml +++ b/project-wizard/kotlin.project-wizard.iml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../project-wizard" /> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module>
\ No newline at end of file diff --git a/repl/kotlin.repl.iml b/repl/kotlin.repl.iml index 3afa2dd4667b..c735f096f856 100644 --- a/repl/kotlin.repl.iml +++ b/repl/kotlin.repl.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/scripting-support/kotlin.scripting-support.iml b/scripting-support/kotlin.scripting-support.iml index 77e3b0f24b1a..61f70c636b1c 100644 --- a/scripting-support/kotlin.scripting-support.iml +++ b/scripting-support/kotlin.scripting-support.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/scripting/kotlin.scripting.iml b/scripting/kotlin.scripting.iml index 1fee5162544a..7492bd028a76 100644 --- a/scripting/kotlin.scripting.iml +++ b/scripting/kotlin.scripting.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" /> diff --git a/test-framework/kotlin.test-framework.iml b/test-framework/kotlin.test-framework.iml index 47f30f1e843a..3b7e4a7e94f7 100644 --- a/test-framework/kotlin.test-framework.iml +++ b/test-framework/kotlin.test-framework.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/tests-common/kotlin.tests-common.iml b/tests-common/kotlin.tests-common.iml index 69105a3a216c..6b4547278e08 100644 --- a/tests-common/kotlin.tests-common.iml +++ b/tests-common/kotlin.tests-common.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" /> diff --git a/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml b/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml index eeab37a16436..fb9c10023e9d 100644 --- a/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml +++ b/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml @@ -14,12 +14,12 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" /> diff --git a/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml index 4f5547539955..715c6c02a6e1 100644 --- a/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml +++ b/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml @@ -14,13 +14,13 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" /> <orderEntry type="library" name="ASM" level="project" /> |