do not export deps blindly (part 3)

GitOrigin-RevId: 7277ece9ded25f1111febc8dccaba9ac8cc75c21
2026-04-19 13:02:30 +07:00 · 2024-12-18 19:24:15 +01:00
parent edad1fb02c
commit a522f96d66
104 changed files with 120 additions and 24 deletions
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -40,6 +40,7 @@
    <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="easymock" level="project" />
    <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -14,9 +14,13 @@
    <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.devkit" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.jvm.analysis" />
    <orderEntry type="module" module-name="intellij.devkit.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.properties" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.properties.psi.impl" />
--- a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
+++ b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.kotlin.plugin.community.main" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.kotlin.devkit" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.tests" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="jetbrains-annotations" level="project" />
--- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
+++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
@@ -14,6 +14,8 @@
    <orderEntry type="module" module-name="intellij.devkit.java.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.i18n" scope="TEST" />
    <orderEntry type="module" module-name="intellij.devkit.themes" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.jvm.analysis" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" scope="TEST" />
    <orderEntry type="module" module-name="intellij.kotlin.devkit" scope="TEST" />
--- a/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml
+++ b/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml
@@ -10,14 +10,14 @@
    <orderEntry type="module" module-name="intellij.devkit.core" />
    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" />
-    <orderEntry type="module" module-name="intellij.xml.dom.tests" exported="" />
-    <orderEntry type="module" module-name="intellij.java.compiler.tests" exported="" />
-    <orderEntry type="module" module-name="intellij.xml.dom" exported="" />
-    <orderEntry type="module" module-name="intellij.xml.dom.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.java.compiler" exported="" />
-    <orderEntry type="module" module-name="intellij.jvm.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.xml.dom.tests" />
+    <orderEntry type="module" module-name="intellij.java.compiler.tests" />
+    <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.jvm.analysis" />
    <orderEntry type="module" module-name="intellij.xml.analysis.impl" scope="TEST" />
  </component>
  <component name="TestModuleProperties" production-module="intellij.devkit.core" />
--- a/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
+++ b/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.gradle.common" />
    <orderEntry type="module" module-name="intellij.gradle.java" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.devkit.core" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.java.psi" />
--- a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.devkit.workspaceModel" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -18,7 +18,7 @@
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="library" exported="" name="slf4j-api" level="project" />
    <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
@@ -36,7 +36,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
    <orderEntry type="module" module-name="intellij.gradle.toolingProxy" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.common" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.gradle.java" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.groovy" />
--- a/plugins/gradle/java/intellij.gradle.java.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.maven.server" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.groovy.rt" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.groovy.spock.rt" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
--- a/plugins/junit/intellij.junit.iml
+++ b/plugins/junit/intellij.junit.iml
@@ -18,7 +18,7 @@
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.indexing" />
-    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
--- a/plugins/junit/java-tests/intellij.junit.java.tests.iml
+++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.junit.rt" scope="TEST" />
    <orderEntry type="module" module-name="intellij.properties.psi.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.junit.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
  </component>
--- a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml
+++ b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit5Launcher" level="project" />
    <orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
--- a/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml
+++ b/plugins/kotlin/base/analysis-api/analysis-api-k2-tests/kotlin.base.analysis.analysis-api.k2.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" scope="TEST" />
--- a/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml
+++ b/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
--- a/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
+++ b/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
@@ -41,6 +41,8 @@
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
    <orderEntry type="module" module-name="intellij.java.psi" />
--- a/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
+++ b/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
@@ -28,6 +28,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="kotlin.base.fir.analysis-api-platform" />
--- a/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml
+++ b/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml
@@ -10,6 +10,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.indices" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/code-insight/fixes-k2/tests/kotlin.code-insight.fixes.k2.tests.iml
+++ b/plugins/kotlin/code-insight/fixes-k2/tests/kotlin.code-insight.fixes.k2.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
--- a/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
@@ -24,6 +24,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlin-reflect" level="project" />
    <orderEntry type="library" scope="TEST" name="gson" level="project" />
--- a/plugins/kotlin/code-insight/inspections-shared/tests/k1/kotlin.code-insight.inspections-shared.tests.k1.iml
+++ b/plugins/kotlin/code-insight/inspections-shared/tests/k1/kotlin.code-insight.inspections-shared.tests.k1.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.psi" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.resources" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.fe10.plugin" scope="TEST" />
--- a/plugins/kotlin/code-insight/inspections-shared/tests/k2/kotlin.code-insight.inspections-shared.tests.k2.iml
+++ b/plugins/kotlin/code-insight/inspections-shared/tests/k2/kotlin.code-insight.inspections-shared.tests.k2.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="kotlin.base.psi" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.resources" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.code-insight.api" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.code-insight.utils" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.code-insight.intentions.k2.tests" scope="TEST" />
--- a/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
@@ -22,6 +22,7 @@
      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
    </content>
    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k1/kotlin.code-insight.intentions-shared.tests.k1.iml
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k1/kotlin.code-insight.intentions-shared.tests.k1.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
--- a/plugins/kotlin/code-insight/intentions-shared/tests/k2/kotlin.code-insight.intentions-shared.tests.k2.iml
+++ b/plugins/kotlin/code-insight/intentions-shared/tests/k2/kotlin.code-insight.intentions-shared.tests.k2.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.psi" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.resources" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" scope="TEST" />
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k1/kotlin.code-insight.k1.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k1/kotlin.code-insight.k1.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
@@ -25,6 +25,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
+++ b/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
@@ -35,6 +35,7 @@
    <orderEntry type="module" module-name="kotlin.base.psi" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.resources" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
--- a/plugins/kotlin/compiler-plugins/allopen/tests-k1/kotlin.compiler-plugins.allopen.tests.k1.iml
+++ b/plugins/kotlin/compiler-plugins/allopen/tests-k1/kotlin.compiler-plugins.allopen.tests.k1.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.core" />
--- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml
+++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml
@@ -10,6 +10,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.facet.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" scope="TEST" />
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.fe10.analysis" />
    <orderEntry type="module" module-name="kotlin.core" />
--- a/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml
+++ b/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" />
    <orderEntry type="module" module-name="kotlin.compiler-plugins.noarg.common" />
--- a/plugins/kotlin/compiler-plugins/parcelize/tests/k1/kotlin.compiler-plugins.parcelize.tests.k1.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/tests/k1/kotlin.compiler-plugins.parcelize.tests.k1.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
  </component>
--- a/plugins/kotlin/compiler-plugins/parcelize/tests/k2/kotlin.compiler-plugins.parcelize.tests.k2.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/tests/k2/kotlin.compiler-plugins.parcelize.tests.k2.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/compiler-plugins/parcelize/tests/kotlin.compiler-plugins.parcelize.tests.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/tests/kotlin.compiler-plugins.parcelize.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml
+++ b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
--- a/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml
+++ b/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.platforms" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.formatter" />
--- a/plugins/kotlin/copyright/fir-tests/kotlin.copyright.fir.tests.iml
+++ b/plugins/kotlin/copyright/fir-tests/kotlin.copyright.fir.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.copyright.tests" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" />
    <orderEntry type="module" module-name="kotlin.test-framework" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/copyright/tests/kotlin.copyright.tests.iml
+++ b/plugins/kotlin/copyright/tests/kotlin.copyright.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.copyright" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" />
    <orderEntry type="module" module-name="kotlin.test-framework" />
    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="RUNTIME" />
--- a/plugins/kotlin/coverage/tests/kotlin.coverage.tests.iml
+++ b/plugins/kotlin/coverage/tests/kotlin.coverage.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.core" />
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -24,6 +24,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.low-level-api-fir" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml
+++ b/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="kotlin.base.util" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.indices" />
    <orderEntry type="module" module-name="kotlin.base.platforms" />
--- a/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml
+++ b/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/gradle/gradle-java/k2/kotlin.gradle.gradle-java.k2.iml
+++ b/plugins/kotlin/gradle/gradle-java/k2/kotlin.gradle.gradle-java.k2.iml
@@ -24,6 +24,7 @@
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.java" />
    <orderEntry type="module" module-name="intellij.gradle.java.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.highlighting.shared" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -55,6 +55,7 @@
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" />
    <orderEntry type="module" module-name="kotlin.base.resources" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="kotlin.base.statistics" />
    <orderEntry type="module" module-name="kotlin.run-configurations.jvm" />
    <orderEntry type="module" module-name="kotlin.formatter" />
--- a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
+++ b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
@@ -11,10 +11,12 @@
    <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.common" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" scope="TEST" />
    <orderEntry type="library" exported="" name="kotlin-gradle-plugin-idea" level="project" />
--- a/plugins/kotlin/gradle/gradle/tests/kotlin.gradle.gradle.tests.iml
+++ b/plugins/kotlin/gradle/gradle/tests/kotlin.gradle.gradle.tests.iml
@@ -22,6 +22,7 @@
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.platforms" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.scripting" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
--- a/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml
+++ b/plugins/kotlin/gradle/multiplatform-tests-k2/intellij.kotlin.gradle.multiplatform-tests.k2.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.core" />
--- a/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml
+++ b/plugins/kotlin/gradle/multiplatform-tests/intellij.kotlin.gradle.multiplatformTests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
--- a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
+++ b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
@@ -34,6 +34,7 @@
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
--- a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2BundledCompilerPluginsHighlightingMetaInfoTest.kt
+++ b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2BundledCompilerPluginsHighlightingMetaInfoTest.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.idea.k2.highlighting

 import com.intellij.openapi.application.PathMacros
@@ -7,7 +7,6 @@ import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.fixtures.MavenDependencyUtil
 import org.jetbrains.kotlin.idea.base.plugin.artifacts.KotlinArtifactConstants
-import org.jetbrains.kotlin.idea.base.plugin.artifacts.KotlinArtifactNames
 import org.jetbrains.kotlin.idea.base.test.ensureFilesResolved
 import org.jetbrains.kotlin.idea.test.Directives
 import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
--- a/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml
+++ b/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="kotlin.highlighting.shared" scope="TEST" />
--- a/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml
+++ b/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml
@@ -10,6 +10,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
    <orderEntry type="module" module-name="kotlin.i18n" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -26,6 +26,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="library" scope="TEST" name="vavr" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.android-extensions-compiler-plugin" level="project" />
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/run/KotlinJUnitLightTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/run/KotlinJUnitLightTest.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.idea.run

 import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection
@@ -30,7 +30,6 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.TestActionEvent
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
-import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.*
 import com.intellij.util.ThreeState
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.idea.junit.JunitKotlinTestFrameworkProvider
--- a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
+++ b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
@@ -25,6 +25,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <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="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
--- a/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
+++ b/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
@@ -24,6 +24,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.injection.tests" scope="TEST" />
  </component>
 </module>
--- a/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
+++ b/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
@@ -23,6 +23,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.injection.tests" scope="TEST" />
--- a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
+++ b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
@@ -27,6 +27,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
--- a/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
+++ b/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
@@ -23,6 +23,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
--- a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
+++ b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
@@ -23,6 +23,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
--- a/plugins/kotlin/jps/graphImplementationTests/kotlin.jps.graphImplementationTests.iml
+++ b/plugins/kotlin/jps/graphImplementationTests/kotlin.jps.graphImplementationTests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="intellij.devkit.jps" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.util.trove" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.jps.build.tests" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
--- a/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml
+++ b/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" scope="TEST" name="jb-jdi" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-cli" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-ir" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
+++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" scope="TEST" name="jb-jdi" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-cli" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-ir" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/kotlin.lombok.tests/kotlin.k2.lombok.tests.iml
+++ b/plugins/kotlin/kotlin.lombok.tests/kotlin.k2.lombok.tests.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
    <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="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.lombok" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
  </component>
--- a/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/kotlin.searching.test.k2.iml
+++ b/plugins/kotlin/kotlin.searching/kotlin.searching.test.k2/kotlin.searching.test.k2.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.searching.k2" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir" scope="RUNTIME" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
--- a/plugins/kotlin/maven/tests/kotlin.maven.tests.iml
+++ b/plugins/kotlin/maven/tests/kotlin.maven.tests.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
--- a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
+++ b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
@@ -26,6 +26,7 @@
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="kotlin.navigation" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.tests" scope="TEST" />
--- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
+++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.project-model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.platforms" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.scripting" />
--- a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml
+++ b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml
@@ -15,6 +15,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.project-model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.base.fe10.analysis" />
--- a/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml
+++ b/plugins/kotlin/project-wizard/tests/kotlin.project-wizard.tests.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.fe10.analysis" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.core" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
--- a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/kotlin.refactorings.common.tests.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="kotlin.refactorings.common" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="library" name="kotlin-reflect" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="kotlin.test-framework" />
  </component>
--- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
@@ -37,6 +37,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.fir" />
    <orderEntry type="module" module-name="kotlin.base.psi" />
--- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
@@ -28,6 +28,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
--- a/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
+++ b/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
@@ -41,6 +41,7 @@
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.fir.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.fir.code-insight" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.refactorings.common" />
    <orderEntry type="module" module-name="kotlin.refactorings.k2" />
--- a/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml
+++ b/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="kotlin.base.facet" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" />
    <orderEntry type="module" module-name="kotlin.base.indices" />
    <orderEntry type="module" module-name="kotlin.run-configurations.jvm" />
--- a/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml
+++ b/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.facet" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="kotlin.base.project-structure" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.base.code-insight" />
--- a/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java
+++ b/plugins/kotlin/run-configurations/testng/src/org/jetbrains/kotlin/idea/testng/KotlinTestNgConfigurationProducer.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.

 package org.jetbrains.kotlin.idea.testng;

@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.extensions.KotlinTestFrameworkProvider.JavaTest
 import org.jetbrains.kotlin.platform.jvm.JvmPlatformKt;
 import org.jetbrains.kotlin.psi.KtFile;

-public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProducer {
+final class KotlinTestNgConfigurationProducer extends TestNGConfigurationProducer {
    @Override
    public boolean shouldReplace(@NotNull ConfigurationFromContext self, ConfigurationFromContext other) {
        return other.isProducedBy(TestNGConfigurationProducer.class);
--- a/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
+++ b/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.scripting" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.analysis" />
    <orderEntry type="module" module-name="kotlin.highlighting.shared" />
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
--- a/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml
+++ b/plugins/kotlin/tests-from-compiler/kotlin.testsFromCompiler.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" 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="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.util.compiler-dependencies" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
--- a/plugins/kotlin/uast/uast-kotlin-base/tests/kotlin.uast.uast-kotlin-base.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin-base/tests/kotlin.uast.uast-kotlin-base.tests.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-base" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
--- a/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-base" />
    <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-base.tests" scope="TEST" />
--- a/plugins/kotlin/uast/uast-kotlin-idea-base/tests/kotlin.uast.uast-kotlin-idea-base.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea-base/tests/kotlin.uast.uast-kotlin-idea-base.tests.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.uast.testFramework" scope="TEST" />
    <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="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
    <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea-base" scope="TEST" />
  </component>
--- a/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/kotlin.uast.uast-kotlin-idea.k2.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/tests/kotlin.uast.uast-kotlin-idea.k2.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
    <orderEntry type="module" module-name="intellij.platform.uast.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea/tests/kotlin.uast.uast-kotlin-idea.tests.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea" />
    <orderEntry type="module" module-name="intellij.platform.util.ex" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
    <orderEntry type="module" module-name="intellij.platform.uast.testFramework" scope="TEST" />
--- a/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml
+++ b/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml
@@ -11,6 +11,7 @@
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
--- a/plugins/kotlin/util/test-generator-api/kotlin.util.test-generator-api.iml
+++ b/plugins/kotlin/util/test-generator-api/kotlin.util.test-generator-api.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
--- a/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml
+++ b/plugins/kotlin/util/test-generator-fe10/kotlin.util.test-generator-fe10.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.scripting-support" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.maven.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.gradle.gradle-java.k1" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.project-wizard.cli" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.project-wizard.tests" scope="TEST" />
--- a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
+++ b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
@@ -27,6 +27,7 @@
    <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-build-common-tests" level="project" />
    <orderEntry type="library" scope="TEST" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
--- a/plugins/testng/intellij.testng.iml
+++ b/plugins/testng/intellij.testng.iml
@@ -25,7 +25,7 @@
    <orderEntry type="library" name="TestNG" level="project" />
    <orderEntry type="module" module-name="intellij.java.indexing" />
    <orderEntry type="module" module-name="intellij.xml.impl" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.java.typeMigration" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml
+++ b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.testng" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
    <orderEntry type="module" module-name="intellij.testng.rt" scope="TEST" />
--- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml
@@ -19,6 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.featuresTrainer" />
    <orderEntry type="module" module-name="intellij.python.featuresTrainer" />
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -43,7 +43,7 @@
    <orderEntry type="library" name="javax.annotation-api" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Ant" level="project" />
    <orderEntry type="module" module-name="intellij.python.psi.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.python.sdk" exported="" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module-library">
--- a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
+++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
    <orderEntry type="module" module-name="intellij.python.community.impl" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
  </component>
--- a/python/pluginCore/impl/src/com/intellij/python/community/plugin/impl/run/PyPluginCommonFragmentsBuilder.kt
+++ b/python/pluginCore/impl/src/com/intellij/python/community/plugin/impl/run/PyPluginCommonFragmentsBuilder.kt
@@ -1,17 +1,17 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.python.community.plugin.impl.run

-import com.jetbrains.python.run.EnvFileComponent.Companion.createEnvFilesFragment
 import com.intellij.execution.ui.SettingsEditorFragment
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.jetbrains.python.run.AbstractPythonRunConfiguration
+import com.jetbrains.python.run.EnvFileComponent.Companion.createEnvFilesFragment
 import com.jetbrains.python.run.PyCommonFragmentsBuilder
 import com.jetbrains.python.run.configuration.PyInterpreterModeNotifier
 import com.jetbrains.python.run.configuration.PyPathMappingsEditorFragment
 import javax.swing.JPanel
 import kotlin.io.path.Path

-class PyPluginCommonFragmentsBuilder: PyCommonFragmentsBuilder() {
+private class PyPluginCommonFragmentsBuilder: PyCommonFragmentsBuilder() {
  override fun <T : AbstractPythonRunConfiguration<*>> createEnvironmentFragments(fragments: MutableList<SettingsEditorFragment<T, *>>,
                                                                                  config: T) {
    val sdkFragment: SettingsEditorFragment<T, JPanel> = PyPluginSdkFragment()
--- a/python/pluginJava/intellij.python.community.plugin.java.iml
+++ b/python/pluginJava/intellij.python.community.plugin.java.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
    <orderEntry type="module" module-name="intellij.python.psi" />
    <orderEntry type="module" module-name="intellij.python.community.impl" />
    <orderEntry type="module" module-name="intellij.java" />
--- a/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java
+++ b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java
@@ -15,7 +15,6 @@ import com.jetbrains.python.packaging.PyPackagesNotificationPanel;
 import com.jetbrains.python.packaging.ui.PyInstalledPackagesPanel;
 import com.jetbrains.python.sdk.PythonSdkType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

 import javax.swing.*;
 import javax.swing.event.AncestorEvent;
@@ -26,9 +25,8 @@ public final class PythonSdkEditorAdditionalOptionsProvider extends SdkEditorAdd
    super(PythonSdkType.getInstance());
  }

-  @Nullable
  @Override
-  public AdditionalDataConfigurable createOptions(@NotNull Project project, @NotNull Sdk sdk) {
+  public @NotNull AdditionalDataConfigurable createOptions(@NotNull Project project, @NotNull Sdk sdk) {
    return new PythonSdkOptionsAdditionalDataConfigurable(project);
  }

--- a/python/python-features-trainer/intellij.python.featuresTrainer.iml
+++ b/python/python-features-trainer/intellij.python.featuresTrainer.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
--- a/Show More
+++ b/Show More