don't export intellij.grid.types

GitOrigin-RevId: f38a458a8614ae3e95616146512d9fc056ed3bbc
2026-04-30 10:20:15 +07:00 · 2025-05-28 12:01:00 +02:00
parent f73b8909d2
commit 398df72a86
22 changed files with 32 additions and 14 deletions
--- a/grid/core-impl/BUILD.bazel
+++ b/grid/core-impl/BUILD.bazel
@@ -31,10 +31,6 @@ jvm_library(
    "//platform/analysis-api:analysis",
    "@lib//:fastutil-min",
  ],
-  exports = [
-    "//grid/types",
-    "//grid/csv:csv-core-impl",
-  ],
  runtime_deps = [":core-impl_resources"]
 )
 ### auto-generated section `build intellij.grid.core.impl` end
--- a/grid/core-impl/intellij.grid.core.impl.iml
+++ b/grid/core-impl/intellij.grid.core.impl.iml
@@ -9,8 +9,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.grid.types" exported="" />
-    <orderEntry type="module" module-name="intellij.grid.csv.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.grid.types" />
+    <orderEntry type="module" module-name="intellij.grid.csv.core.impl" />
    <orderEntry type="module" module-name="intellij.grid" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
--- a/grid/impl/BUILD.bazel
+++ b/grid/impl/BUILD.bazel
@@ -23,6 +23,8 @@ jvm_library(
  javac_opts = ":custom-javac-options",
  deps = [
    "//grid/core-impl",
+    "//grid/csv:csv-core-impl",
+    "//grid/types",
    "//platform/editor-ui-api:editor-ui",
    "//platform/platform-impl:ide-impl",
    "//platform/lang-impl",
--- a/grid/impl/intellij.grid.impl.iml
+++ b/grid/impl/intellij.grid.impl.iml
@@ -9,6 +9,8 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.grid.core.impl" />
+    <orderEntry type="module" module-name="intellij.grid.csv.core.impl" />
+    <orderEntry type="module" module-name="intellij.grid.types" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
--- a/grid/impl/resources/intellij.grid.impl.xml
+++ b/grid/impl/resources/intellij.grid.impl.xml
@@ -2,6 +2,8 @@
  <dependencies>
    <module name="intellij.grid.core.impl"/>
    <module name="intellij.platform.navbar.frontend"/>
+    <module name="intellij.grid.csv.core.impl"/>
+    <module name="intellij.grid.types"/>
    <module name="intellij.libraries.microba"/>
  </dependencies>

--- a/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt
+++ b/platform/build-scripts/usages/src/AddDependencyToImlByUsage.kt
@@ -34,7 +34,7 @@ internal class AddDependencyToImlByUsage {
    fun main(args: Array<String>) {
      val m2Repo = Path.of(System.getProperty("user.home"), ".m2/repository")
      //val projectDir = Path.of(PathManager.getHomePath())
-      val projectDir = Path.of("/Users/${System.getProperty("user.home")}/projects/idea")
+      val projectDir = Path.of("${System.getProperty("user.home")}/projects/idea")
      val project = JpsSerializationManager.getInstance().loadProject(projectDir.toString(), mapOf("MAVEN_REPOSITORY" to m2Repo.toString()), true)

      val items = listOf(
@@ -77,12 +77,13 @@ internal class AddDependencyToImlByUsage {
        //"intellij.platform.indexing",
        //"intellij.platform.ide",
        //"intellij.platform.jps.model",
-        "intellij.platform.testFramework",
-        "intellij.platform.credentialStore",
-        "intellij.platform.credentialStore.impl",
+        //"intellij.platform.testFramework",
+        //"intellij.platform.credentialStore",
+        //"intellij.platform.credentialStore.impl",
        //"intellij.platform.macro",
-        "intellij.platform.lvcs",
-        "intellij.platform.lvcs.impl",
+        //"intellij.platform.lvcs",
+        "intellij.grid.csv.core.impl",
+        "intellij.grid.types",
        //"intellij.c",
        //"intellij.cidr.core",
      )
--- a/platform/credential-store-impl/BUILD.bazel
+++ b/platform/credential-store-impl/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
    "//platform/remote-core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/util:util-ui",
+    "//platform/core-api:core",
    "@lib//:kotlin-stdlib",
    "@lib//:kotlinx-coroutines-core",
    "@lib//:jna",
@@ -54,6 +55,7 @@ jvm_library(
    "//platform/remote-core",
    "//platform/editor-ui-api:editor-ui",
    "//platform/util:util-ui",
+    "//platform/core-api:core",
    "@lib//:kotlin-stdlib",
    "@lib//:kotlinx-coroutines-core",
    "@lib//:jna",
--- a/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml
+++ b/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml
@@ -20,6 +20,7 @@
    <orderEntry type="module" module-name="intellij.platform.remote.core" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" name="jna" level="project" />
--- a/platform/lang-core/BUILD.bazel
+++ b/platform/lang-core/BUILD.bazel
@@ -21,6 +21,7 @@ jvm_library(
    "//platform/util/jdom",
    "//platform/util-class-loader:util-classLoader",
    "//platform/util",
+    "//platform/core-api:core",
    "//platform/util/concurrency",
    "//platform/code-style-api:codeStyle",
    "//platform/util:util-ui",
--- a/platform/lang-core/intellij.platform.lang.core.iml
+++ b/platform/lang-core/intellij.platform.lang.core.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
    <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
    <orderEntry type="module" module-name="intellij.platform.codeStyle" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
--- a/platform/project/shared/BUILD.bazel
+++ b/platform/project/shared/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
    "//platform/util",
    "//platform/projectModel-api:projectModel",
    "//platform/util/coroutines",
+    "//platform/core-api:core",
    "//platform/platform-impl/rpc",
  ],
  runtime_deps = [":project_resources"]
--- a/platform/project/shared/intellij.platform.project.iml
+++ b/platform/project/shared/intellij.platform.project.iml
@@ -41,6 +41,7 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
  </component>
 </module>
--- a/platform/projectModel-api/BUILD.bazel
+++ b/platform/projectModel-api/BUILD.bazel
@@ -24,7 +24,6 @@ jvm_library(
    "//platform/backend/workspace",
    "//platform/util/xmlDom",
  ],
-  exports = ["//platform/core-api:core"],
  runtime_deps = [":projectModel_resources"]
 )
 ### auto-generated section `build intellij.platform.projectModel` end
--- a/platform/projectModel-api/intellij.platform.projectModel.iml
+++ b/platform/projectModel-api/intellij.platform.projectModel.iml
@@ -9,7 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="intellij.platform.jps.model" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
--- a/plugins/kotlin/base/compiler-configuration/BUILD.bazel
+++ b/plugins/kotlin/base/compiler-configuration/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
    "//platform/util",
    "//plugins/kotlin/base/frontend-agnostic",
    "//platform/util/jdom",
+    "//platform/core-api:core",
    "//platform/projectModel-impl",
  ]
 )
--- a/plugins/kotlin/base/compiler-configuration/kotlin.base.compiler-configuration.iml
+++ b/plugins/kotlin/base/compiler-configuration/kotlin.base.compiler-configuration.iml
@@ -13,6 +13,7 @@
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
  </component>
 </module>
--- a/plugins/kotlin/completion/api/BUILD.bazel
+++ b/plugins/kotlin/completion/api/BUILD.bazel
@@ -9,6 +9,7 @@ jvm_library(
  deps = [
    "@lib//:kotlin-stdlib",
    "//plugins/kotlin/base/frontend-agnostic",
+    "//platform/core-api:core",
    "//platform/analysis-api:analysis",
    "//platform/projectModel-impl",
  ]
--- a/plugins/kotlin/completion/api/kotlin.completion.api.iml
+++ b/plugins/kotlin/completion/api/kotlin.completion.api.iml
@@ -9,6 +9,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.analysis" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
  </component>
--- a/python/python-venv/BUILD.bazel
+++ b/python/python-venv/BUILD.bazel
@@ -27,6 +27,7 @@ jvm_library(
    "//python/python-sdk:sdk",
    "//platform/projectModel-api:projectModel",
    "//platform/util",
+    "//platform/core-api:core",
  ],
  runtime_deps = [":community-impl-venv_resources"]
 )
@@ -55,6 +56,7 @@ jvm_library(
    "@lib//:junit5",
    "//platform/ide-core-impl",
    "//platform/execution",
+    "//platform/core-api:core",
  ],
  runtime_deps = [
    ":community-impl-venv_resources",
--- a/python/python-venv/intellij.python.community.impl.venv.iml
+++ b/python/python-venv/intellij.python.community.impl.venv.iml
@@ -24,5 +24,6 @@
    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
  </component>
 </module>
--- a/python/setup-test-environment/conda/BUILD.bazel
+++ b/python/setup-test-environment/conda/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
    "//platform/projectModel-api:projectModel",
    "//platform/execution",
    "//platform/util",
+    "@lib//:kotlinx-coroutines-core",
  ],
  runtime_deps = [":conda_resources"]
 )
--- a/python/setup-test-environment/conda/intellij.python.community.testFramework.testEnv.conda.iml
+++ b/python/setup-test-environment/conda/intellij.python.community.testFramework.testEnv.conda.iml
@@ -15,5 +15,6 @@
    <orderEntry type="module" module-name="intellij.platform.projectModel" />
    <orderEntry type="module" module-name="intellij.platform.execution" />
    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
  </component>
 </module>