IJ-MR-175479 IJ-CR-146078 IJPL-209476 fast-util

GitOrigin-RevId: 87af2a3aad6e264a9b332c20ff572ec735f741f2

.idea/modules.xml

@@ -637,6 +637,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml" filepath="$PROJECT_DIR$/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/detekt-compose-rules/intellij.libraries.detekt.compose.rules.iml" filepath="$PROJECT_DIR$/libraries/detekt-compose-rules/intellij.libraries.detekt.compose.rules.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/dokka/intellij.libraries.dokka.iml" filepath="$PROJECT_DIR$/libraries/dokka/intellij.libraries.dokka.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/fastutil/intellij.libraries.fastutil.iml" filepath="$PROJECT_DIR$/libraries/fastutil/intellij.libraries.fastutil.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" filepath="$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/gson/intellij.libraries.gson.iml" filepath="$PROJECT_DIR$/libraries/gson/intellij.libraries.gson.iml" />

RegExpSupport/BUILD.bazel

@@ -25,7 +25,7 @@ jvm_library(
     "//platform/lang-impl",
     "//platform/refactoring",
     "//xml/xml-psi-api:psi",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/ide-core-impl",
     "//platform/core-ui",
     "//platform/util/jdom",
@@ -53,7 +53,7 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//xml/xml-psi-api:psi",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/ide-core-impl",
     "//platform/core-ui",
     "//platform/util/jdom",

RegExpSupport/intellij.regexp.iml

@@ -25,7 +25,7 @@
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />

build/bazel-generated-file-list.txt

@@ -348,6 +348,7 @@ libraries/compose-foundation-desktop-junit
 libraries/compose-runtime-desktop
 libraries/detekt-compose-rules
 libraries/dokka
+libraries/fastutil
 libraries/grpc
 libraries/grpc-netty-shaded
 libraries/gson
@@ -393,8 +394,6 @@ libraries/testcontainers
 libraries/testng
 libraries/winp
 libraries/xerces
-libraries/xml-rpc
-libraries/xstream
 libraries/xz
 notebooks/notebook-ui
 notebooks/visualization

build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml

@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" scope="PROVIDED" name="kotlin-stdlib" level="project" />
   </component>
 </module>

build/jvm-rules/zip/intellij.idea.community.build.zip.iml

@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
   </component>
 </module>

build/tasks/BUILD.bazel

@@ -12,7 +12,7 @@ jvm_library(
     "//libraries/kotlinx/serialization/json",
     "//platform/util/zip",
     "@lib//:kotlinx-collections-immutable",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "//libraries/jackson/jr-objects:libraries-jackson-jr-objects",
@@ -50,7 +50,7 @@ jvm_library(
     "//libraries/kotlinx/serialization/json",
     "//platform/util/zip",
     "@lib//:kotlinx-collections-immutable",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "//libraries/jackson/jr-objects:libraries-jackson-jr-objects",

build/tasks/intellij.idea.community.build.tasks.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.jr.objects" />

grid/core-impl/BUILD.bazel

@@ -30,7 +30,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/projectModel-api:projectModel",
     "//platform/analysis-api:analysis",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
   ]
 )
 ### auto-generated section `build intellij.grid.core.impl` end

grid/core-impl/intellij.grid.core.impl.iml

@@ -25,6 +25,6 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
   </component>
 </module>

grid/impl/BUILD.bazel

@@ -47,7 +47,7 @@ jvm_library(
     "//platform/lang-core",
     "//platform/lang-impl",
     "//platform/core-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/diff-api:diff",
     "//platform/projectModel-api:projectModel",
     "//platform/structure-view-impl:structureView-impl",

grid/impl/intellij.grid.impl.iml

@@ -44,7 +44,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />

java/compiler/impl/BUILD.bazel

@@ -59,7 +59,7 @@ jvm_library(
     "@lib//:protobuf",
     "@lib//:netty-codec-http",
     "@lib//:stream_ex",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:jps-javac-extension",
     "@lib//:netty-buffer",
     "//libraries/winp",

java/compiler/impl/intellij.java.compiler.impl.iml

@@ -59,7 +59,7 @@
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="jps-javac-extension" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.winp" />

java/debugger/impl/BUILD.bazel

@@ -53,7 +53,7 @@ jvm_library(
     "//platform/statistics",
     "//images",
     "//platform/core-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "//libraries/gson",
     "//libraries/asm",
@@ -121,7 +121,7 @@ jvm_library(
     "//images",
     "//images:images_test_lib",
     "//platform/core-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "//libraries/gson",
     "//libraries/asm",

java/debugger/impl/intellij.java.debugger.impl.iml

@@ -81,7 +81,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />

java/execution/impl/BUILD.bazel

@@ -48,7 +48,7 @@ jvm_library(
     "//platform/util/nanoxml",
     "//libraries/jackson/databind",
     "//platform/xdebugger-impl:debugger-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/statistics",
     "//platform/util-class-loader:util-classLoader",
     "//platform/diff-api:diff",

java/execution/impl/intellij.java.execution.impl.iml

@@ -42,7 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <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" />

java/idea-ui/BUILD.bazel

@@ -44,7 +44,7 @@ jvm_library(
     "@lib//:stream_ex",
     "@lib//:kotlinx-coroutines-core",
     "//platform/statistics",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/lang-impl",
     "//platform/workspace/jps",

java/idea-ui/intellij.java.ui.iml

@@ -39,7 +39,7 @@
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />

java/java-analysis-impl/BUILD.bazel

@@ -44,7 +44,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//java/openapi:java",
     "//platform/util:util-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/workspace/storage",
     "//libraries/icu4j",
     "//platform/util/jdom",

java/java-analysis-impl/intellij.java.analysis.impl.iml

@@ -47,7 +47,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.libraries.icu4j" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />

java/java-frontback-psi-impl/BUILD.bazel

@@ -21,7 +21,7 @@ jvm_library(
     "//libraries/asm",
     "@lib//:stream_ex",
     "//platform/util",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:kotlin-stdlib",
     "//libraries/kotlinx/serialization/core",
     "//platform/syntax/syntax-psi:psi",

java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml

@@ -37,7 +37,7 @@
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" />

java/java-impl-inspections/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/ide-core-impl",
     "//java/compiler/openapi:java-compiler",
     "//libraries/asm",

java/java-impl-inspections/intellij.java.impl.inspections.iml

@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.libraries.asm" />

java/java-impl-refactorings/BUILD.bazel

@@ -37,7 +37,7 @@ jvm_library(
     "//platform/ide-core-impl",
     "@lib//:stream_ex",
     "//platform/code-style-impl:codeStyle-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/diff-impl",
     "//platform/usageView-impl",
     "//platform/util/diff",

java/java-impl-refactorings/intellij.java.impl.refactorings.iml

@@ -37,7 +37,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" />

java/java-impl/BUILD.bazel

@@ -78,7 +78,7 @@ jvm_library(
     "//plugins/copyright",
     "@lib//:stream_ex",
     "//platform/statistics",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/platform-util-io-impl:ide-util-io-impl",

java/java-impl/intellij.java.impl.iml

@@ -100,7 +100,7 @@
     <orderEntry type="module" module-name="intellij.copyright" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />

java/java-indexing-impl/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/util",
     "//java/java-indexing-api:indexing",
     "@lib//:kotlin-stdlib",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//java/codeserver/core",
     "//java/java-syntax:syntax",
   ],

java/java-indexing-impl/intellij.java.indexing.impl.iml

@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.java.codeserver.core" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
   </component>

java/java-psi-impl/BUILD.bazel

@@ -22,7 +22,7 @@ jvm_library(
     "//libraries/asm",
     "//platform/util",
     "@lib//:stream_ex",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//java/java-syntax:syntax",
     "//platform/syntax/syntax-psi:psi",
   ],

java/java-psi-impl/intellij.java.psi.impl.iml

@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.libraries.asm" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.java.syntax" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" exported="" />
   </component>

java/java-tests/BUILD.bazel

@@ -114,7 +114,7 @@ jvm_library(
     "//platform/statistics",
     "//platform/statistics:statistics_test_lib",
     "@lib//:jaxb-api",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/platform-impl:ide-impl",
     "//jps/model-impl",
     "//platform/core-ui",

java/java-tests/intellij.java.tests.iml

@@ -90,7 +90,7 @@
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jaxb-api" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />

java/testFramework/BUILD.bazel

@@ -45,7 +45,7 @@ jvm_library(
     "//java/execution/openapi:java-execution",
     "//jps/jps-builders:build",
     "@lib//:stream_ex",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/platform-util-io:ide-util-io",

java/testFramework/intellij.java.testFramework.iml

@@ -42,7 +42,7 @@
     <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" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />

jps/jps-builders/BUILD.bazel

@@ -31,7 +31,7 @@ jvm_library(
     "@lib//:javax-annotation-api",
     "@lib//:platform-jps-build-qdox-java-parser",
     "//libraries/gson",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:jps-javac-extension",
     "@community//build:build-javac-rt",
     "//platform/tracing:tracing-rt",
@@ -94,7 +94,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//libraries/asm",
     "//jps/model-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/gson",
     "@community//build:build-javac-rt",
     "//platform/platform-util-io:ide-util-io",

jps/jps-builders/intellij.platform.jps.build.iml

@@ -60,7 +60,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.libraries.gson" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="jps-javac-extension" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
     <orderEntry type="module" module-name="intellij.platform.tracing.rt" />

jps/jps-builders/intellij.platform.jps.build.tests.iml

@@ -24,7 +24,7 @@
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.asm" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />

jps/model-impl/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
   deps = [
     "//platform/util",
     "//jps/model-api:model",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
   ]
 )
 ### auto-generated section `build intellij.platform.jps.model.impl` end

jps/model-impl/intellij.platform.jps.model.impl.iml

@@ -26,6 +26,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
   </component>
 </module>

jps/model-serialization/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
   deps = [
     "//platform/util",
     "//jps/model-api:model",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/jdom",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",

jps/model-serialization/intellij.platform.jps.model.serialization.iml

@@ -26,7 +26,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />

json/backend/BUILD.bazel

@@ -35,7 +35,7 @@ jvm_library(
     "//platform/indexing-impl",
     "//platform/refactoring",
     "//platform/statistics",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",
     "@lib//:kotlin-stdlib",

json/backend/intellij.json.backend.iml

@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />

libraries/fastutil/BUILD.bazel

@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.fastutil` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "fastutil_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "fastutil",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":fastutil_resources"],
+  exports = ["@lib//:fastutil-min"],
+  runtime_deps = ["@lib//:fastutil-min"]
+)
+### auto-generated section `build intellij.libraries.fastutil` end

libraries/fastutil/intellij.libraries.fastutil.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="fastutil-min" level="project" />
+  </component>
+</module>

libraries/fastutil/resources/intellij.libraries.fastutil.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

platform/analysis-impl/BUILD.bazel

@@ -31,7 +31,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//platform/util:util-ui",
     "//libraries/gson",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/code-style-api:codeStyle",
     "//platform/platform-util-io:ide-util-io",

platform/analysis-impl/intellij.platform.analysis.impl.iml

@@ -26,7 +26,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />

platform/build-scripts/BUILD.bazel

@@ -37,7 +37,7 @@ jvm_library(
     "//platform/testFramework/core",
     "//platform/util-class-loader:util-classLoader",
     "//libraries/jackson/jr-objects:libraries-jackson-jr-objects",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/gson",
     "@lib//:protobuf",
     "//build/tasks",

platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml

@@ -38,7 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="library" name="kaml" level="project" />

platform/build-scripts/dev-server/BUILD.bazel

@@ -24,7 +24,7 @@ jvm_library(
     "//platform/boot",
     "//platform/util-class-loader:util-classLoader",
     "//platform/util/rt-java8",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/hash4j",
     "//platform/diagnostic/telemetry.exporters",
     "//platform/util/coroutines",

platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml

@@ -47,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.platform.util.rt.java8" />
     <orderEntry type="module" module-name="intellij.libraries.xz" scope="RUNTIME" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.exporters" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />

platform/build-scripts/icons/BUILD.bazel

@@ -29,7 +29,7 @@ jvm_library(
     "//platform/util/rt-java8",
     "//libraries/gson",
     "@lib//:kotlinx-coroutines-core",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/zip",
     "@lib//:platform-images-build-pngencoder",
     "//libraries/hash4j",
@@ -65,7 +65,7 @@ jvm_library(
     "//platform/util/rt-java8",
     "//libraries/gson",
     "@lib//:kotlinx-coroutines-core",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/zip",
     "@lib//:platform-images-build-pngencoder",
     "//libraries/hash4j",

platform/build-scripts/icons/intellij.platform.images.build.iml

@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.rt.java8" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />
     <orderEntry type="module-library">
       <library name="pngencoder" type="repository">

platform/build-scripts/intellij.platform.buildScripts.iml

@@ -50,7 +50,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.core" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.jr.objects" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.devkit.jps" scope="RUNTIME" />

platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt

@@ -25,6 +25,7 @@ private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
   "intellij.libraries.compose.foundation.desktop",
   "intellij.libraries.compose.foundation.desktop.junit",
   "intellij.libraries.compose.runtime.desktop",
+  "intellij.libraries.fastutil",
   "intellij.libraries.grpc",
   "intellij.libraries.grpc.netty.shaded",
   "intellij.libraries.gson",
@@ -56,8 +57,6 @@ private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
   "intellij.libraries.rhino",
   "intellij.libraries.testng",
   "intellij.libraries.winp",
-  "intellij.libraries.xml.rpc",
-  "intellij.libraries.xstream",
   "intellij.libraries.xz",
   "intellij.libraries.dokka",
   "intellij.libraries.guava",

platform/build-scripts/tests/BUILD.bazel

@@ -38,7 +38,7 @@ jvm_library(
     "@community//build:zip",
     "@lib//:netty-buffer",
     "//libraries/hash4j",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:maven-resolver-provider",
     "//libraries/mockito",
     "@lib//:mockito-kotlin",

platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml

@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.idea.community.build.zip" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="netty-buffer" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="maven-resolver-provider" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />

platform/build-scripts/usages/BUILD.bazel

@@ -10,7 +10,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "//platform/util",
     "//platform/util/jdom",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/kotlinx/serialization/json",
     "//libraries/kotlinx/serialization/core",
     "@lib//:kaml",

platform/build-scripts/usages/intellij.platform.buildScripts.usages.iml

@@ -31,7 +31,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="library" name="kaml" level="project" />

platform/built-in-server/BUILD.bazel

@@ -32,7 +32,7 @@ jvm_library(
     "//platform/diff-api:diff",
     "@lib//:kotlin-stdlib",
     "@lib//:netty-codec-http",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/jackson/jackson",
     "//libraries/jackson/jr-objects:libraries-jackson-jr-objects",
     "@lib//:netty-buffer",

platform/built-in-server/intellij.platform.builtInServer.impl.iml

@@ -29,7 +29,7 @@
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.jr.objects" />
     <orderEntry type="library" name="netty-buffer" level="project" />

platform/code-style-impl/BUILD.bazel

@@ -23,7 +23,7 @@ jvm_library(
     "//platform/util:util-ui",
     "@lib//:kotlin-stdlib",
     "@lib//:stream_ex",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/editor-ui-api:editor-ui",
   ]
 )

platform/code-style-impl/intellij.platform.codeStyle.impl.iml

@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
   </component>
 </module>

platform/collaboration-tools/BUILD.bazel

@@ -34,7 +34,7 @@ jvm_library(
     "//libraries/miglayout-swing",
     "@lib//:kotlin-stdlib",
     "//platform/diff-api:diff",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/diff-impl",
     "//platform/credential-store-ui:credentialStore-ui",
     "//platform/vcs-impl",
@@ -80,7 +80,7 @@ jvm_library(
     "//libraries/miglayout-swing",
     "@lib//:kotlin-stdlib",
     "//platform/diff-api:diff",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/diff-impl",
     "@lib//:junit4",
     "//platform/credential-store-ui:credentialStore-ui",

platform/collaboration-tools/intellij.platform.collaborationTools.iml

@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore.ui" />

platform/configuration-store-impl/BUILD.bazel

@@ -34,7 +34,7 @@ jvm_library(
     "//platform/ide-core-impl",
     "@lib//:snakeyaml-engine",
     "//platform/statistics",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/diff-api:diff",
     "//platform/core-ui",
     "//libraries/aalto-xml",
@@ -94,7 +94,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "//platform/statistics",
     "//platform/statistics:statistics_test_lib",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/jdom",
     "//platform/settings",
     "//platform/settings-local",

platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml

@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" name="snakeyaml-engine" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.libraries.aalto.xml" />

platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml

@@ -49,7 +49,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.settings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.settings.local" scope="TEST" />

platform/core-impl/BUILD.bazel

@@ -19,7 +19,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
     "//platform/util/jdom",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util-class-loader:util-classLoader",
     "//libraries/aalto-xml",
     "//platform/util/xmlDom",

platform/core-impl/intellij.platform.core.impl.iml

@@ -28,7 +28,7 @@
     <orderEntry type="library" exported="" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.libraries.aalto.xml" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />

platform/credential-store-impl/BUILD.bazel

@@ -35,7 +35,7 @@ jvm_library(
     "//libraries/guava",
     "@lib//:bouncy-castle-provider",
     "@lib//:snakeyaml",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:platform-credential_store-impl-dbus-java",
     "//libraries/caffeine",
   ]
@@ -69,7 +69,7 @@ jvm_library(
     "//libraries/guava",
     "@lib//:bouncy-castle-provider",
     "@lib//:snakeyaml",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:platform-credential_store-impl-dbus-java",
     "//libraries/caffeine",
     "//platform/testFramework",

platform/credential-store-impl/intellij.platform.credentialStore.impl.iml

@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="library" name="bouncy-castle-provider" level="project" />
     <orderEntry type="library" name="snakeyaml" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module-library">
       <library name="dbus-java" type="repository">
         <properties maven-id="com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.2.1">

platform/diagnostic/BUILD.bazel

@@ -11,7 +11,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:jetbrains-annotations",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
   ]
 )
 ### auto-generated section `build intellij.platform.diagnostic` end

platform/diagnostic/intellij.platform.diagnostic.iml

@@ -26,6 +26,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
   </component>
 </module>

platform/diagnostic/startUpPerformanceReporter/BUILD.bazel

@@ -20,7 +20,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/util-ex",
     "//platform/util:util-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util-class-loader:util-classLoader",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "@lib//:opentelemetry",

platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="library" name="opentelemetry" level="project" />

platform/diff-impl/BUILD.bazel

@@ -32,7 +32,7 @@ jvm_library(
     "//platform/statistics",
     "//platform/boot",
     "//platform/core-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "@lib//:kotlinx-coroutines-core",
     "//platform/util/coroutines",

platform/diff-impl/intellij.platform.diff.impl.iml

@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />

platform/duplicates-analysis/BUILD.bazel

@@ -21,7 +21,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//platform/projectModel-api:projectModel",
     "//platform/projectModel-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/jdom",
   ]
 )

platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml

@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
 </module>

platform/editor-ui-ex/BUILD.bazel

@@ -23,7 +23,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/projectModel-impl",
     "//platform/util:util-ui",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/util/jdom",
     "//platform/statistics",

platform/editor-ui-ex/intellij.platform.editor.ex.iml

@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />

platform/execution-impl/BUILD.bazel

@@ -41,7 +41,7 @@ jvm_library(
     "//platform/observable",
     "//platform/util-ex",
     "//platform/projectModel-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-ui",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "@lib//:jediterm-core",

platform/execution-impl/intellij.platform.execution.impl.iml

@@ -60,7 +60,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="library" name="jediterm-core" level="project" />

platform/execution.dashboard/BUILD.bazel

@@ -25,7 +25,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/statistics",
     "//platform/platform-impl:ide-impl",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//libraries/guava",
     "//platform/ide-core-impl",
     "//platform/execution.serviceView",

platform/execution.dashboard/intellij.platform.execution.dashboard.iml

@@ -44,7 +44,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.serviceView" />

platform/extensions/BUILD.bazel

@@ -10,7 +10,7 @@ jvm_library(
   deps = [
     "//platform/util/jdom",
     "//platform/util",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:kotlin-stdlib",
     "//platform/util/xmlDom",
     "@lib//:kotlinx-coroutines-core",

platform/extensions/intellij.platform.extensions.iml

@@ -34,7 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />
     <orderEntry type="library" exported="" name="kotlinx-coroutines-core" level="project" />

platform/external-system-impl/BUILD.bazel

@@ -39,7 +39,7 @@ jvm_library(
     "//platform/statistics",
     "//platform/workspace/jps",
     "//platform/workspace/storage",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "@lib//:commons-cli",
     "//platform/core-ui",
     "//platform/platform-util-io-impl:ide-util-io-impl",

platform/external-system-impl/intellij.platform.externalSystem.impl.iml

@@ -56,7 +56,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="library" name="commons-cli" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />

platform/ide-core-impl/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/analysis-impl",
     "//libraries/icu4j",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/editor-ui-api:editor-ui",
     "//platform/core-ui",
     "//jps/model-impl",

platform/ide-core-impl/intellij.platform.ide.core.impl.iml

@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.libraries.icu4j" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />

platform/indexing-impl/BUILD.bazel

@@ -16,7 +16,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:stream_ex",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/util/jdom",
     "//platform/statistics",
     "@lib//:hdr_histogram",

platform/indexing-impl/intellij.platform.indexing.impl.iml

@@ -16,7 +16,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="library" name="HdrHistogram" level="project" />

platform/kernel/pasta/BUILD.bazel

@@ -14,7 +14,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "@lib//:kotlinx-collections-immutable",
     "//libraries/kotlinx/serialization/core",
-    "@lib//:fastutil-min",
+    "//libraries/fastutil",
     "//platform/core-api:core",
     "//platform/util",
     "//platform/util/coroutines",