Create separate module for FE1.0 & FIR plugins resources

GitOrigin-RevId: 82b00a24b7e9f178ac85165ed93105abe62e71c7
2026-01-05 01:50:56 +07:00 · 2020-11-25 15:29:04 +01:00
parent 9469226cc7
commit 11fc24ff9e
22 changed files with 49 additions and 14 deletions
--- a/plugins/kotlin/common/kotlin.common.iml
+++ b/plugins/kotlin/common/kotlin.common.iml
@@ -4,7 +4,7 @@
    <facet type="kotlin-language" name="Kotlin">
      <configuration version="3" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
        <compilerSettings>
-          <option name="additionalArguments" value="-version -Xstrict-java-nullability-assertions -Xjvm-default=enable -Xopt-in=kotlin.io.path.ExperimentalPathApi" />
+          <option name="additionalArguments" value="-version -Xstrict-java-nullability-assertions -Xjvm-default=enable" />
        </compilerSettings>
        <compilerArguments>
          <option name="jvmTarget" value="1.8" />
@@ -22,7 +22,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
@@ -30,6 +30,6 @@
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
-    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/completion/kotlin.completion.iml
+++ b/plugins/kotlin/completion/kotlin.completion.iml
@@ -32,5 +32,6 @@
    <orderEntry type="module" module-name="kotlin.formatter" />
    <orderEntry type="module" module-name="kotlin.idea" />
    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml
+++ b/plugins/kotlin/fir-low-level-api/kotlin.fir.fir-low-level-api.iml
@@ -26,6 +26,7 @@
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="kotlin.resources-fir" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-fir" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
--- a/plugins/kotlin/fir/kotlin.fir.iml
+++ b/plugins/kotlin/fir/kotlin.fir.iml
@@ -19,14 +19,12 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <content url="file://$MODULE_DIR$/../resources-fir">
-      <sourceFolder url="file://$MODULE_DIR$/../resources-fir" type="java-resource" />
-    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="kotlin.resources-fir" />
    <orderEntry type="module" module-name="kotlin.common" />
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
--- a/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml
+++ b/plugins/kotlin/frontend-fir/kotlin.fir.frontend-fir.iml
@@ -22,7 +22,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlin.fir" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.resources-fir" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-stdlib-jdk8" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
--- a/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
+++ b/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
@@ -71,5 +71,6 @@
    <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
+++ b/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
@@ -40,5 +40,6 @@
    <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
+++ b/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
@@ -29,5 +29,7 @@
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -28,9 +28,6 @@
    <content url="file://$MODULE_DIR$/../live-templates">
      <sourceFolder url="file://$MODULE_DIR$/../live-templates/src" isTestSource="false" />
    </content>
-    <content url="file://$MODULE_DIR$/../resources-descriptors">
-      <sourceFolder url="file://$MODULE_DIR$/../resources-descriptors" type="java-resource" />
-    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler" level="project" />
@@ -83,6 +80,7 @@
    <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
    <orderEntry type="library" name="intellij-markdown" level="project" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.grazie" />
  </component>
--- a/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml
+++ b/plugins/kotlin/j2k/idea/kotlin.j2k.idea.iml
@@ -29,5 +29,6 @@
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
    <orderEntry type="module" module-name="kotlin.j2k.old" />
    <orderEntry type="module" module-name="intellij.java.analysis.impl" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/j2k/new/kotlin.j2k.new.iml
+++ b/plugins/kotlin/j2k/new/kotlin.j2k.new.iml
@@ -30,5 +30,6 @@
    <orderEntry type="module" module-name="kotlin.j2k.old" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/j2k/old/kotlin.j2k.old.iml
+++ b/plugins/kotlin/j2k/old/kotlin.j2k.old.iml
@@ -28,5 +28,6 @@
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
    <orderEntry type="module" module-name="intellij.java.psi.impl" />
-  </component>
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
+</component>
 </module>
--- a/plugins/kotlin/j2k/services/kotlin.j2k.services.iml
+++ b/plugins/kotlin/j2k/services/kotlin.j2k.services.iml
@@ -38,5 +38,6 @@
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.java.indexing" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
+++ b/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
@@ -27,5 +27,6 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
+++ b/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
@@ -36,5 +36,6 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
+++ b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
@@ -73,6 +73,7 @@
    <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.common" />
    <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.gradle" />
    <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.tests" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" />
    <orderEntry type="module" module-name="kotlin.jps-plugin.tests" />
    <orderEntry type="module" module-name="kotlin.refIndex" />
--- a/plugins/kotlin/kotlin.resources-descriptors.iml
+++ b/plugins/kotlin/kotlin.resources-descriptors.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/resources-descriptors">
+      <sourceFolder url="file://$MODULE_DIR$/resources-descriptors" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/plugins/kotlin/kotlin.resources-fir.iml
+++ b/plugins/kotlin/kotlin.resources-fir.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/resources-fir">
+      <sourceFolder url="file://$MODULE_DIR$/resources-fir" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/plugins/kotlin/maven/kotlin.maven.iml
+++ b/plugins/kotlin/maven/kotlin.maven.iml
@@ -35,5 +35,6 @@
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.maven" />
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/native/kotlin.native.iml
+++ b/plugins/kotlin/native/kotlin.native.iml
@@ -38,5 +38,6 @@
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.gradle.common" />
-  </component>
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
+ </component>
 </module>
--- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
+++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
@@ -67,5 +67,6 @@
        </SOURCES>
      </library>
    </orderEntry>
-  </component>
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
+ </component>
 </module>
--- a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
+++ b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
@@ -47,5 +47,6 @@
    <orderEntry type="module" module-name="intellij.maven" />
    <orderEntry type="module" module-name="intellij.gradle.common" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
-  </component>
+    <orderEntry type="module" module-name="kotlin.resources-descriptors" scope="TEST" />
+</component>
 </module>