do not export deps blindly (part 5)

GitOrigin-RevId: 48daba2ea218703ecd0f60b5b12cc813c8802338
2026-03-22 15:19:59 +07:00 · 2024-12-23 09:25:18 +01:00
parent 2195d8f195
commit 7b4c77396e
149 changed files with 243 additions and 149 deletions
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.jsp" />
--- a/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.kt
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.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 com.intellij.compiler.impl.vcs

 import com.intellij.build.BuildContentManager
@@ -25,7 +25,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.util.concurrent.CompletableFuture

-class UnloadedModulesCompilationCheckinHandler(private val project: Project,
+private class UnloadedModulesCompilationCheckinHandler(private val project: Project,
                                               private val checkinPanel: CheckinProjectPanel) : CheckinHandler(), CommitCheck {

  override fun getBeforeCheckinConfigurationPanel(): RefreshableOnComponent? {
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -76,6 +76,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.buildScripts.downloader" />
    <orderEntry type="module" module-name="intellij.platform.feedback" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" name="kotlinx-datetime-jvm" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.debugger" />
@@ -43,6 +44,7 @@
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.execution.testDiscovery;

 import com.intellij.execution.testDiscovery.actions.ShowAffectedTestsAction;
@@ -20,7 +20,7 @@ import static com.intellij.ui.SimpleTextAttributes.STYLE_UNDERLINE;
 final class AffectedTestsInChangeListPainter implements ChangeListDecorator {
  private final Project myProject;

-  public AffectedTestsInChangeListPainter(@NotNull Project project) {
+  AffectedTestsInChangeListPainter(@NotNull Project project) {
    myProject = project;
  }

--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.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 com.intellij.execution.testDiscovery.actions;

 import com.intellij.CommonBundle;
@@ -83,8 +83,7 @@ import java.util.stream.Stream;
 import static com.intellij.openapi.actionSystem.CommonDataKeys.*;
 import static com.intellij.openapi.util.Pair.pair;

-public class ShowAffectedTestsAction extends AnAction {
-
+public final class ShowAffectedTestsAction extends AnAction {
  @Override
  public @NotNull ActionUpdateThread getActionUpdateThread() {
    return ActionUpdateThread.BGT;
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -15,9 +15,11 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="jna" level="project" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.java.compiler" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.openapi.roots.ui.configuration.projectRoot

 import com.intellij.diff.DiffManager
@@ -18,7 +18,7 @@ import java.awt.event.ActionEvent
 import javax.swing.Action
 import javax.swing.JComponent

-class LibraryJarsDiffDialog(libraryFile: VirtualFile,
+internal class LibraryJarsDiffDialog(libraryFile: VirtualFile,
                            downloadedFile: VirtualFile,
                            private val mavenCoordinates: JpsMavenRepositoryLibraryDescriptor,
                            private val libraryName: String,
--- a/java/java-impl-inspections/intellij.java.impl.inspections.iml
+++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" name="ASM" level="project" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
  </component>
--- a/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java
+++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java
@@ -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 com.intellij.codeInspection.java19api;

 import com.intellij.codeInspection.java19api.DescriptorsGenerator.ModuleFiles;
@@ -41,7 +41,7 @@ import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Stream;

-public final class Java9GenerateModuleDescriptorsAction extends AnAction {
+final class Java9GenerateModuleDescriptorsAction extends AnAction {
  private static final Logger LOG = Logger.getInstance(Java9GenerateModuleDescriptorsAction.class);
  private static final String CLASS_FILE_PATTERN = "glob:*" + CommonClassNames.CLASS_FILE_EXTENSION;

--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.xml.impl" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
    <orderEntry type="module" module-name="intellij.jsp" />
@@ -76,7 +77,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
    <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
-    <orderEntry type="module" module-name="intellij.platform.backend.workspace" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="library" name="caffeine" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
--- a/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.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 com.intellij.codeInsight.hints

 import com.intellij.codeInsight.daemon.impl.JavaCodeVisionUsageCollector
@@ -7,7 +7,7 @@ import com.intellij.psi.*
 import com.intellij.psi.util.PsiUtil
 import java.awt.event.MouseEvent

-class JavaVcsCodeVisionContext : VcsCodeVisionCurlyBracketLanguageContext() {
+private class JavaVcsCodeVisionContext : VcsCodeVisionCurlyBracketLanguageContext() {
  override fun isAccepted(element: PsiElement): Boolean {
    return element is PsiMethod || (element is PsiClass && element !is PsiTypeParameter)
  }
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -15,9 +15,11 @@
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.impl.inspections" />
    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.idea.community.customization" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.java.i18n" exported="" />
--- a/java/openapi/intellij.java.iml
+++ b/java/openapi/intellij.java.iml
@@ -15,9 +15,9 @@
    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
    <orderEntry type="module" module-name="intellij.platform.icons" />
    <orderEntry type="module" module-name="intellij.xml" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.vcs" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.xml.dom" />
    <orderEntry type="module" module-name="intellij.java.resources.en" exported="" />
    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -7,11 +7,12 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.java" exported="" />
+    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
    <orderEntry type="module" module-name="intellij.java.debugger" />
@@ -21,10 +22,10 @@
    <orderEntry type="module" module-name="intellij.java.plugin" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" />
-    <orderEntry type="module" module-name="intellij.relaxng" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.ui" exported="" />
+    <orderEntry type="module" module-name="intellij.relaxng" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
-    <orderEntry type="module" module-name="intellij.java.execution" exported="" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="library" name="StreamEx" level="project" />
--- a/java/unscramble/intellij.java.unscramble.iml
+++ b/java/unscramble/intellij.java.unscramble.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.platform.threadDumpParser" />
--- a/java/vcs/intellij.java.vcs.iml
+++ b/java/vcs/intellij.java.vcs.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.uast" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
  </component>
 </module>
--- a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
+++ b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="intellij.jvm.analysis.testFramework" exported="" />
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" exported="" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" />
+    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" />
  </component>
--- a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml
+++ b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml
@@ -6,6 +6,8 @@
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.jvm.analysis.internal.testFramework" scope="TEST" />
  </component>
--- a/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml
+++ b/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml
@@ -7,6 +7,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.k1" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
--- a/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml
+++ b/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.jvm.analysis.kotlin.tests.shared" scope="TEST" />
  </component>
 </module>
--- a/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml
+++ b/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" exported="" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" exported="" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.test" exported="" 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/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml
+++ b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml
@@ -8,6 +8,6 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.java.testFramework" exported="" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
  </component>
 </module>
--- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml
+++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/platform/core-api/intellij.platform.core.iml
+++ b/platform/core-api/intellij.platform.core.iml
@@ -26,7 +26,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.util.progress" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml
+++ b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
  </component>
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -16,6 +16,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
--- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.kt
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.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 com.intellij.dvcs.ui

 import com.intellij.dvcs.repo.Repository
@@ -10,11 +10,9 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode
 import com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory
 import com.intellij.openapi.vcs.changes.ui.SimpleChangesGroupingPolicy
 import com.intellij.openapi.vcs.changes.ui.StaticFilePath
-import org.jetbrains.annotations.ApiStatus
 import javax.swing.tree.DefaultTreeModel

-@ApiStatus.Internal
-class RepositoryChangesGroupingPolicy(val project: Project, model: DefaultTreeModel) : SimpleChangesGroupingPolicy<Repository>(model) {
+internal class RepositoryChangesGroupingPolicy(val project: Project, model: DefaultTreeModel) : SimpleChangesGroupingPolicy<Repository>(model) {
  private val repositoryManager = VcsRepositoryManager.getInstance(project)
  private val colorManager = getColorManager(project)

--- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
    <orderEntry type="library" name="kotlin-reflect" level="project" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -65,6 +65,7 @@
    <orderEntry type="library" name="jackson-databind" level="project" />
    <orderEntry type="library" name="jackson-module-kotlin" level="project" />
    <orderEntry type="library" name="xz" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
--- a/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt
+++ b/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt
@@ -23,8 +23,7 @@ import org.jetbrains.annotations.ApiStatus.Internal
 import java.util.function.Consumer

 // This class is thread safe
-@Internal
-class IndexingProgressReporter {
+internal class IndexingProgressReporter {
  @Volatile
  internal var subTasksCount: Int = 0
  internal val operationName = MutableStateFlow<@ProgressText String?>(null)
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" name="jna" level="project" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -83,6 +83,7 @@
    <orderEntry type="library" name="blockmap" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
    <orderEntry type="library" name="netty-buffer" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="library" name="zip-signer" level="project" />
--- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml
+++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="library" scope="TEST" name="jmock" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
    <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
--- a/platform/rd-platform-community/intellij.platform.rd.community.iml
+++ b/platform/rd-platform-community/intellij.platform.rd.community.iml
@@ -14,6 +14,7 @@
    <orderEntry type="library" exported="" name="rd-framework" level="project" />
    <orderEntry type="library" name="rd-text" level="project" />
    <orderEntry type="library" exported="" name="rd-swing" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -50,6 +50,7 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
--- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
+++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
@@ -10,6 +10,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
@@ -17,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
  </component>
 </module>
--- a/platform/smart-update/intellij.smart.update.iml
+++ b/platform/smart-update/intellij.smart.update.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
--- a/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt
+++ b/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt
@@ -29,8 +29,7 @@ private val LOG = logger<SmartUpdate>()

@State(name = "SmartUpdateOptions", storages = [Storage(value = StoragePathMacros.WORKSPACE_FILE, roamingType = RoamingType.DISABLED)])
@Service(Service.Level.PROJECT)
-class SmartUpdate(val project: Project, private val coroutineScope: CoroutineScope) : PersistentStateComponent<SmartUpdate.Options>, Disposable {
-
+internal class SmartUpdate(val project: Project, private val coroutineScope: CoroutineScope) : PersistentStateComponent<SmartUpdate.Options>, Disposable {
  class Options: BaseState() {
    var scheduled by property(false)
    var scheduledTime by property(LocalTime.of(8, 0).toSecondOfDay())
--- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml
+++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml
@@ -18,6 +18,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.json" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.statistics.uploader" />
--- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml
+++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
@@ -11,10 +11,10 @@
    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.icons" />
    <orderEntry type="library" name="automaton" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
--- a/platform/util/diff/api-dump.txt
+++ b/platform/util/diff/api-dump.txt
@@ -332,6 +332,6 @@ c:com.intellij.util.diff.Diff$ChangeBuilder
 - addChange(I,I):V
 - addEqual(I):V
 - getFirstChange():com.intellij.util.diff.Diff$Change
-c:com.intellij.util.diff.FilesTooBigForDiffException
+f:com.intellij.util.diff.FilesTooBigForDiffException
 - java.lang.Exception
 - <init>():V
--- a/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java
+++ b/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java
@@ -1,7 +1,7 @@
-// Copyright 2000-2021 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 com.intellij.util.diff;

-public class FilesTooBigForDiffException extends Exception {
+public final class FilesTooBigForDiffException extends Exception {
  public FilesTooBigForDiffException() {
    super("Unable to calculate diff. File is too big and there are too many changes.");
  }
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -7,10 +7,10 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.vcs.core" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.diff" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml
+++ b/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml
@@ -10,6 +10,8 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
  </component>
 </module>
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -32,7 +32,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.vcs" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
@@ -55,6 +55,7 @@
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" name="caffeine" level="project" />
    <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
+++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic" />
    <orderEntry type="module" module-name="intellij.platform.statistics" />
--- a/platform/vcs-log/api/intellij.platform.vcs.log.iml
+++ b/platform/vcs-log/api/intellij.platform.vcs.log.iml
@@ -15,5 +15,6 @@
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
  </component>
 </module>
--- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
@@ -12,6 +12,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
  </component>
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl.lang" />
    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="JUnit4" level="project" />
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.openapi.vcs.roots

 import com.intellij.openapi.vcs.VcsRootChecker
@@ -6,7 +6,7 @@ import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs
 import com.intellij.openapi.vfs.VirtualFile
 import java.nio.file.Files

-class MockRootChecker(private val vcs: MockAbstractVcs) : VcsRootChecker() {
+internal class MockRootChecker(private val vcs: MockAbstractVcs) : VcsRootChecker() {
  private val ignoredDirs = HashSet<VirtualFile>()

  override fun getSupportedVcs() = vcs.keyInstanceMethod!!
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.openapi.vcs.roots

 import com.intellij.openapi.extensions.ExtensionPoint
@@ -23,7 +23,7 @@ internal const val DOT_MOCK = ".mock"
 abstract class VcsRootBaseTest : VcsPlatformTest() {
  protected lateinit var vcs: MockAbstractVcs

-  protected lateinit var rootChecker: MockRootChecker
+  internal lateinit var rootChecker: MockRootChecker
  protected lateinit var rootModule: Module

  private val extensionPoint: ExtensionPoint<VcsRootChecker>
--- a/platform/warmup/intellij.platform.warmup.iml
+++ b/platform/warmup/intellij.platform.warmup.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.ide.bootstrap" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
--- a/plugins/copyright/vcs/intellij.copyright.vcs.iml
+++ b/plugins/copyright/vcs/intellij.copyright.vcs.iml
@@ -12,6 +12,8 @@
    <orderEntry type="module" module-name="intellij.copyright" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
  </component>
 </module>
--- a/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt
+++ b/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt
@@ -55,7 +55,8 @@ private class UpdateCopyrightCheckinHandler(private val project: Project) : Chec
    return null
  }

-  private val settings: UpdateCopyrightCheckinHandlerState get() = UpdateCopyrightCheckinHandlerState.getInstance(project)
+  private val settings: UpdateCopyrightCheckinHandlerState
+    get() = UpdateCopyrightCheckinHandlerState.getInstance(project)

  private fun getPsiFiles(files: List<VirtualFile>): Array<PsiFile> {
    val psiFiles = mutableListOf<PsiFile>()
--- a/plugins/coverage-common/intellij.platform.coverage.iml
+++ b/plugins/coverage-common/intellij.platform.coverage.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.extensions" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
--- a/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java
+++ b/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java
@@ -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 com.intellij.coverage;

 import com.intellij.history.LocalHistory;
@@ -33,15 +33,15 @@ import java.util.List;
 /**
 * This service finds correspondence of lines of a file in a specified timestamp in VCS/local history and current state of the file.
 */
-class LineHistoryMapper {
+final class LineHistoryMapper {
  private static final Logger LOG = Logger.getInstance(LineHistoryMapper.class);
  private final Object myLock = new Object();
  private final Project myProject;
  private final VirtualFile myFile;
  private final Document myDocument;
  private final long myDate;
-  protected SoftReference<Int2IntMap> myNewToOldLines;
-  protected SoftReference<Int2IntMap> myOldToNewLines;
+  private SoftReference<Int2IntMap> myNewToOldLines;
+  private SoftReference<Int2IntMap> myOldToNewLines;
  private volatile SoftReference<byte[]> myOldContent;

  LineHistoryMapper(Project project, VirtualFile file, Document document, long date) {
@@ -179,7 +179,7 @@ class LineHistoryMapper {
    });
  }

-  protected Int2IntMap buildMapping(Diff.Change change, int firstNLines) {
+  private static Int2IntMap buildMapping(Diff.Change change, int firstNLines) {
    Int2IntMap result = new Int2IntOpenHashMap();
    int prevLineInFirst = 0;
    int prevLineInSecond = 0;
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -36,6 +36,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
    <orderEntry type="module" module-name="intellij.java.impl" />
    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
@@ -73,6 +74,7 @@
    <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
    <orderEntry type="module" module-name="intellij.smart.update" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
--- a/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt
+++ b/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt
@@ -16,7 +16,7 @@ import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor
 * Default implementation of [IntelliJSdkExternalAnnotationsRepository] that delegates to [JarRepositoryManager]
 * for searching and downloading artifacts from the IntelliJ Artifacts Repositories.
 */
-class PublicIntelliJSdkExternalAnnotationsRepository(private val project: Project) : IntelliJSdkExternalAnnotationsRepository {
+internal class PublicIntelliJSdkExternalAnnotationsRepository(private val project: Project) : IntelliJSdkExternalAnnotationsRepository {

  companion object {
    const val RELEASES_REPO_URL = "https://www.jetbrains.com/intellij-repository/releases/"
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -14,6 +14,9 @@
    <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.java.execution" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <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" />
--- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt
+++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt
@@ -14,7 +14,6 @@ import com.intellij.openapi.util.RecursionManager
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.testFramework.PsiTestUtil
-import com.intellij.testFramework.UsefulTestCase
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase
 import com.intellij.testFramework.fixtures.TempDirTestFixture
--- 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
@@ -11,6 +11,7 @@
    <orderEntry type="module" module-name="kotlin.code-insight.k2" />
    <orderEntry type="module" module-name="intellij.devkit" />
    <orderEntry type="module" module-name="intellij.devkit.core" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <orderEntry type="module" module-name="intellij.devkit.testFramework" />
    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="module" module-name="intellij.kotlin.plugin.community.main" scope="RUNTIME" />
--- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
+++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
@@ -13,6 +13,7 @@
    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
    <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.java" 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" />
--- a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml
@@ -10,6 +10,7 @@
    <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.java" 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/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -15,6 +15,7 @@
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="module" module-name="intellij.java.ui" />
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the 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.idea.eclipse.importer.colors;

 import com.intellij.execution.process.ConsoleHighlighter;
@@ -40,8 +26,7 @@ import java.io.IOException;
 import java.io.InputStream;

@SuppressWarnings("UseJBColor")
-public class EclipseColorSchemeImporter implements SchemeImporter<EditorColorsScheme>, EclipseColorThemeElements {
-
+public final class EclipseColorSchemeImporter implements SchemeImporter<EditorColorsScheme>, EclipseColorThemeElements {
  private final static String[] ECLIPSE_THEME_EXTENSIONS = {"xml"};

  private final static TextAttributesKey[] ATTRIBUTES_TO_COPY = {
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -82,6 +82,7 @@
    <orderEntry type="library" scope="TEST" name="commons-lang3" level="project" />
    <orderEntry type="module" module-name="intellij.platform.externalProcessAuthHelper" exported="" />
    <orderEntry type="module" module-name="intellij.platform.externalProcessAuthHelper.rt" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
    <orderEntry type="library" name="opentelemetry" level="project" />
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt
@@ -47,7 +47,7 @@ import org.jetbrains.annotations.PropertyKey

 abstract class GitCheckinHandlerFactory : VcsCheckinHandlerFactory(GitVcs.getKey())

-class GitUserNameCheckinHandlerFactory : GitCheckinHandlerFactory() {
+private class GitUserNameCheckinHandlerFactory : GitCheckinHandlerFactory() {
  override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler {
    return GitUserNameCheckinHandler(panel.project)
  }
@@ -65,19 +65,18 @@ class GitLargeFileCheckinHandlerFactory : GitCheckinHandlerFactory() {
  }
 }

-class GitDetachedRootCheckinHandlerFactory : GitCheckinHandlerFactory() {
+private class GitDetachedRootCheckinHandlerFactory : GitCheckinHandlerFactory() {
  override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler {
    return GitDetachedRootCheckinHandler(panel.project)
  }
 }

-class GitFileNameCheckinHandlerFactory : GitCheckinHandlerFactory() {
+private class GitFileNameCheckinHandlerFactory : GitCheckinHandlerFactory() {
  override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler {
    return GitFileNameCheckinHandler(panel.project)
  }
 }

-
 private class GitCRLFCheckinHandler(project: Project) : GitCheckinHandler(project) {
  override fun getExecutionOrder(): CommitCheck.ExecutionOrder = CommitCheck.ExecutionOrder.EARLY

--- a/plugins/github/github-core/intellij.vcs.github.iml
+++ b/plugins/github/github-core/intellij.vcs.github.iml
@@ -44,6 +44,7 @@
    <orderEntry type="module" module-name="intellij.xml.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="intellij.tasks.jira" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
    <orderEntry type="library" name="Guava" level="project" />
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.plugins.github.pullrequest.action

 import com.intellij.openapi.actionSystem.DataKey
@@ -6,7 +6,7 @@ import org.jetbrains.plugins.github.pullrequest.data.GHPRIdentifier
 import org.jetbrains.plugins.github.pullrequest.ui.list.GHPRListController
 import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel

-object GHPRActionKeys {
+internal object GHPRActionKeys {
  @JvmStatic
  val PULL_REQUEST_ID = DataKey.create<GHPRIdentifier>("org.jetbrains.plugins.github.pullrequest.id")

--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.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.plugins.github.pullrequest.ui

 import com.intellij.collaboration.async.cancelledWith
@@ -39,7 +39,7 @@ import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRInfoView
 import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel

@ApiStatus.Internal
-interface GHPRViewModelContainer {
+internal interface GHPRViewModelContainer {
  val aiReviewVm: StateFlow<GHPRAIReviewViewModel?>
  val aiSummaryVm: StateFlow<GHPRAISummaryViewModel?>

--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt
@@ -7,11 +7,8 @@ import com.intellij.collaboration.ui.codereview.comment.CodeReviewSubmittableTex
 import com.intellij.collaboration.ui.codereview.comment.CodeReviewTextEditingViewModel
 import com.intellij.collaboration.ui.icon.IconsProvider
 import com.intellij.collaboration.util.SingleCoroutineLauncher
-import com.intellij.openapi.progress.EmptyProgressIndicator
 import com.intellij.openapi.project.Project
 import com.intellij.platform.util.coroutines.childScope
-import com.intellij.util.io.await
-import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.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.plugins.github.pullrequest.ui.diff

 import com.intellij.collaboration.async.*
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt
@@ -10,7 +10,7 @@ import org.jetbrains.plugins.github.ai.GHPRAICommentViewModel
 import org.jetbrains.plugins.github.pullrequest.ui.comment.GHPRCompactReviewThreadViewModel
 import javax.swing.Icon

-sealed interface GHPREditorMappedComponentModel : CodeReviewInlayModel {
+internal sealed interface GHPREditorMappedComponentModel : CodeReviewInlayModel {
  abstract class Thread<VM : GHPRCompactReviewThreadViewModel>(val vm: VM)
    : GHPREditorMappedComponentModel, Hideable {
    final override val key: Any = vm.id
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// 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.plugins.github.pullrequest.ui.timeline

 import com.intellij.collaboration.ui.CollaborationToolsUIUtil
@@ -27,7 +27,7 @@ import org.jetbrains.plugins.github.pullrequest.ui.timeline.GHPRTimelineItemUIUt
 import org.jetbrains.plugins.github.ui.avatars.GHAvatarIconsProvider
 import javax.swing.JComponent

-class GHPRTimelineEventComponentFactoryImpl(
+internal class GHPRTimelineEventComponentFactoryImpl(
  private val timelineVm: GHPRTimelineViewModel
 ) : GHPRTimelineEventComponentFactory<GHPRTimelineEvent> {

--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.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.plugins.github.pullrequest.ui.timeline

 import com.intellij.collaboration.ui.*
@@ -41,7 +41,7 @@ import org.jetbrains.plugins.github.ui.util.addGithubHyperlinkListener
 import org.jetbrains.plugins.github.ui.util.handleGithubHyperlink
 import javax.swing.JComponent

-class GHPRTimelineItemComponentFactory(private val project: Project,
+internal class GHPRTimelineItemComponentFactory(private val project: Project,
                                       private val timelineVm: GHPRTimelineViewModel)
  : (CoroutineScope, GHPRTimelineItem) -> JComponent {

--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.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.plugins.github.pullrequest.ui.timeline

 import com.intellij.collaboration.async.launchNow
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.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.plugins.github.pullrequest.ui.timeline.item

 import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestCommitShort
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.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.plugins.github.pullrequest.ui.timeline.item

 import com.intellij.collaboration.async.launchNow
@@ -13,7 +13,6 @@ import com.intellij.collaboration.util.SingleCoroutineLauncher
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.platform.util.coroutines.childScope
-import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.BufferOverflow
@@ -47,7 +46,7 @@ interface GHPRTimelineReviewViewModel {
  fun editBody()
 }

-class UpdateableGHPRTimelineReviewViewModel internal constructor(
+internal class UpdateableGHPRTimelineReviewViewModel internal constructor(
  private val project: Project,
  parentCs: CoroutineScope,
  private val dataContext: GHPRDataContext,
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.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.plugins.github.pullrequest.ui.timeline.item

 import com.intellij.collaboration.async.mapDataToModel
@@ -70,7 +70,7 @@ interface GHPRTimelineThreadViewModel

 private val LOG = logger<UpdateableGHPRTimelineThreadViewModel>()

-class UpdateableGHPRTimelineThreadViewModel internal constructor(
+internal class UpdateableGHPRTimelineThreadViewModel internal constructor(
  override val project: Project,
  parentCs: CoroutineScope,
  private val dataContext: GHPRDataContext,
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.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.plugins.github.pullrequest.ui.toolwindow.model

 import com.github.benmanes.caffeine.cache.Caffeine
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.kt
+++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.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.plugins.github.pullrequest.ui.toolwindow.model

 import com.intellij.collaboration.async.combineState
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" />
    <orderEntry type="library" exported="" name="slf4j-api" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
    <orderEntry type="library" exported="" name="Gradle" level="project" />
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -17,9 +17,11 @@
    <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.backend.workspace" />
    <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.java" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
@@ -72,6 +72,7 @@
      </library>
    </orderEntry>
    <orderEntry type="library" scope="TEST" name="ion" level="project" />
+    <orderEntry type="module" module-name="intellij.java" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.boot" scope="TEST" />
    <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
--- a/plugins/grazie/src/intellij.grazie.core.iml
+++ b/plugins/grazie/src/intellij.grazie.core.iml
@@ -17,6 +17,7 @@
    <orderEntry type="library" name="commons-logging" level="project" />
    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
    <orderEntry type="library" name="commons-text" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
--- a/plugins/grazie/src/test/intellij.grazie.tests.iml
+++ b/plugins/grazie/src/test/intellij.grazie.tests.iml
@@ -10,7 +10,7 @@
    <orderEntry type="module" module-name="intellij.spellchecker" />
    <orderEntry type="module" module-name="intellij.grazie" exported="" />
    <orderEntry type="library" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="intellij.java.testFramework" exported="" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="module-library">
      <library name="org.jetbrains.intellij.deps.languagetool:languagetool-core" type="repository">
        <properties maven-id="org.jetbrains.intellij.deps.languagetool:languagetool-core:6.5.0.12">
@@ -147,7 +147,9 @@
    <orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
    <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
    <orderEntry type="module" module-name="intellij.grazie.java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="module" module-name="intellij.markdown" scope="TEST" />
    <orderEntry type="module" module-name="intellij.markdown.plugin" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
--- a/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml
+++ b/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.junit.testFramework" scope="TEST" />
  </component>
 </module>
--- a/plugins/junit/intellij.junit.iml
+++ b/plugins/junit/intellij.junit.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.java.execution.impl" />
    <orderEntry type="module" module-name="intellij.java.rt" />
    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="intellij.junit.rt" />
    <orderEntry type="module" module-name="intellij.java.compiler" />
--- a/plugins/junit/java-tests/intellij.junit.java.tests.iml
+++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml
@@ -12,6 +12,7 @@
    <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.java.testFramework" scope="TEST" />
    <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/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml
+++ b/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml
@@ -10,6 +10,7 @@
    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.junit.kotlin.tests.shared" 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/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml
+++ b/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml
@@ -7,6 +7,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="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.junit.kotlin.tests.shared" scope="TEST" />
--- a/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml
+++ b/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml
@@ -8,6 +8,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="kotlin.plugin.common" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.junit.testFramework" exported="" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" exported="" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.test-framework" exported="" scope="TEST" />
--- a/plugins/junit/testFramework/intellij.junit.testFramework.iml
+++ b/plugins/junit/testFramework/intellij.junit.testFramework.iml
@@ -10,7 +10,7 @@
    <orderEntry type="module" module-name="intellij.jvm.analysis.testFramework" exported="" />
    <orderEntry type="module" module-name="intellij.junit" exported="" />
    <orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
-    <orderEntry type="module" module-name="intellij.java.testFramework" exported="" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
  </component>
--- a/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml
+++ b/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml
@@ -12,6 +12,7 @@
    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
+    <orderEntry type="module" module-name="intellij.java.ui" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.plugin" />
    <orderEntry type="module" module-name="kotlin.base.platforms" />
    <orderEntry type="module" module-name="kotlin.base.project-model" />
--- 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" scope="TEST" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="kotlin.base.indices" scope="TEST" />
  </component>
--- a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
+++ b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
@@ -38,6 +38,7 @@
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
+    <orderEntry type="module" module-name="intellij.platform.util.progress" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
    <orderEntry type="module" module-name="kotlin.base.util" />
    <orderEntry type="module" module-name="kotlin.base.psi" />
--- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt
+++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt
@@ -9,7 +9,7 @@ import kotlin.script.experimental.dependencies.ArtifactWithLocation
 import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
 import kotlin.script.experimental.dependencies.RepositoryCoordinates

-class ReportingExternalDependenciesResolver(
+internal class ReportingExternalDependenciesResolver(
  private val delegate: ExternalDependenciesResolver,
  private val dependenciesResolutionService: DependencyResolutionService,
 ) : ExternalDependenciesResolver {
--- a/Show More
+++ b/Show More