IJ-MR-175479 IJ-CR-146078 IJPL-209476 gson as product module

GitOrigin-RevId: 4e0ec5a56b91ff85cef4343c34f36e18adec1e9e

build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt

@@ -36,6 +36,7 @@ suspend fun buildCommunityStandaloneJpsBuilder(
     "intellij.platform.util.nanoxml",
     "intellij.libraries.hash4j",
     "intellij.libraries.caffeine",
+    "intellij.libraries.gson",
     "intellij.libraries.aalto.xml",
   ).map { ModuleItem(moduleName = it, relativeOutputFile = "util.jar", reason = null) })
 
@@ -99,7 +100,6 @@ suspend fun buildCommunityStandaloneJpsBuilder(
     "slf4j-api",
     "plexus-utils",
     "jetbrains-annotations",
-    "gson",
     "jps-javac-extension",
     "fastutil-min",
     "kotlin-stdlib",

java/debugger/impl/BUILD.bazel

@@ -55,7 +55,7 @@ jvm_library(
     "//platform/core-ui",
     "@lib//:fastutil-min",
     "//platform/platform-util-io-impl:ide-util-io-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:asm",
     "//platform/util/jdom",
     "//platform/build-scripts/downloader",
@@ -123,7 +123,7 @@ jvm_library(
     "//platform/core-ui",
     "@lib//:fastutil-min",
     "//platform/platform-util-io-impl:ide-util-io-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:asm",
     "//platform/util/jdom",
     "//platform/build-scripts/downloader",

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

@@ -83,7 +83,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.buildScripts.downloader" />

java/execution/impl/BUILD.bazel

@@ -40,7 +40,7 @@ jvm_library(
     "@lib//:intellij-test-discovery",
     "//platform/external-system-api:externalSystem",
     "//platform/external-system-impl:externalSystem-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:jackson",
     "@lib//:miglayout-swing",
     "//platform/vcs-impl",

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

@@ -34,7 +34,7 @@
     <orderEntry type="library" name="intellij-test-discovery" level="project" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="miglayout-swing" level="project" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />

java/java-impl/BUILD.bazel

@@ -68,7 +68,7 @@ jvm_library(
     "//java/java-structure-view:structureView",
     "//spellchecker",
     "//platform/built-in-server:builtInServer-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "//java/compiler/openapi:java-compiler",
     "//platform/object-serializer:objectSerializer-annotations",
     "//platform/external-system-impl:externalSystem-impl",

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

@@ -72,7 +72,7 @@
     <orderEntry type="module" module-name="intellij.java.structureView" exported="" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="library" scope="RUNTIME" name="jaxb-runtime" level="project" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />

jps/jps-builders/BUILD.bazel

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

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

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

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

@@ -25,7 +25,7 @@
     <orderEntry type="library" scope="TEST" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <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" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />

json/backend/BUILD.bazel

@@ -31,7 +31,7 @@ jvm_library(
     "//platform/analysis-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/ide-core-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/indexing-impl",
     "//platform/refactoring",
     "//platform/statistics",

json/backend/intellij.json.backend.iml

@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />

notebooks/visualization/BUILD.bazel

@@ -24,7 +24,7 @@ jvm_library(
   resources = [":visualization_resources"],
   kotlinc_opts = ":custom_visualization",
   deps = [
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
@@ -54,7 +54,7 @@ jvm_library(
   kotlinc_opts = ":custom_visualization",
   associates = [":visualization"],
   deps = [
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",

notebooks/visualization/intellij.notebooks.visualization.iml

@@ -32,7 +32,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />

platform/analysis-impl/BUILD.bazel

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

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

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

platform/build-scripts/BUILD.bazel

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

platform/build-scripts/icons/BUILD.bazel

@@ -27,7 +27,7 @@ jvm_library(
     "@lib//:okhttp",
     "//build/tasks",
     "//platform/util/rt-java8",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:fastutil-min",
     "//platform/util/zip",
@@ -63,7 +63,7 @@ jvm_library(
     "//build/tasks",
     "//build/tasks:tasks_test_lib",
     "//platform/util/rt-java8",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:fastutil-min",
     "//platform/util/zip",

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

@@ -26,7 +26,7 @@
     <orderEntry type="library" name="okhttp" level="project" />
     <orderEntry type="module" module-name="intellij.idea.community.build.tasks" />
     <orderEntry type="module" module-name="intellij.platform.util.rt.java8" />
-    <orderEntry type="library" name="gson" level="project" />
+    <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.platform.util.zip" />

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

@@ -51,7 +51,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="library" name="jackson-jr-objects" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <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" />
     <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="RUNTIME" />

platform/built-in-server/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/ide-core/plugins",
     "//platform/xdebugger-api:debugger",
     "//libraries/guava",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:commons-imaging",
     "//platform/built-in-server-api:builtInServer",
     "//platform/diff-api:diff",
@@ -83,7 +83,7 @@ jvm_library(
     "//platform/lang-impl",
     "//platform/xdebugger-api:debugger",
     "//libraries/guava",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:commons-imaging",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",

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

@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="commons-imaging" level="project" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" exported="" />
     <orderEntry type="module" module-name="intellij.platform.diff" />

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

@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="commons-imaging" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />

platform/lang-impl/BUILD.bazel

@@ -51,7 +51,7 @@ jvm_library(
     "//platform/workspace/jps",
     "@lib//:swingx",
     "//libraries/guava",
-    "@lib//:gson",
+    "//libraries/gson",
     "//jps/model-impl",
     "//platform/analysis-impl",
     "//platform/structure-view-impl:structureView-impl",
@@ -181,7 +181,7 @@ jvm_library(
     "//platform/ide-core-impl",
     "//libraries/guava",
     "//platform/editor-ui-ex:editor-ex",
-    "@lib//:gson",
+    "//libraries/gson",
     "//jps/model-impl",
     "//platform/analysis-impl",
     "//platform/structure-view-impl:structureView-impl",

platform/lang-impl/intellij.platform.lang.impl.iml

@@ -59,7 +59,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />

platform/lang-impl/intellij.platform.lang.tests.iml

@@ -57,7 +57,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />

platform/platform-impl/BUILD.bazel

@@ -61,7 +61,7 @@ jvm_library(
     "//platform/refactoring",
     "//platform/analysis-impl",
     "//platform/editor-ui-ex:editor-ex",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:http-client",
     "//platform/diff-api:diff",
     "@lib//:imgscalr",
@@ -220,7 +220,7 @@ jvm_library(
     "//platform/refactoring",
     "//platform/analysis-impl",
     "//platform/editor-ui-ex:editor-ex",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:http-client",
     "//platform/diff-api:diff",
     "@lib//:imgscalr",

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

@@ -60,7 +60,7 @@
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="http-client" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="library" name="imgscalr" level="project" />

platform/platform-impl/internal/BUILD.bazel

@@ -47,7 +47,7 @@ jvm_library(
     "//libraries/kotlinx/serialization/json",
     "@lib//:fastutil-min",
     "//libraries/hash4j",
-    "@lib//:gson",
+    "//libraries/gson",
     "//libraries/kotlinx/serialization/core",
     "@lib//:kotlin-reflect",
     "@lib//:jna",

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

@@ -62,7 +62,7 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="library" name="jna" level="project" />

platform/platform-tests/BUILD.bazel

@@ -68,7 +68,7 @@ jvm_library(
     "//plugins/grazie/src:core",
     "@lib//:http-client",
     "//jps/model-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlin-stdlib",
     "@lib//:easymock",
     "@lib//:assert_j",

platform/platform-tests/intellij.platform.tests.iml

@@ -56,7 +56,7 @@
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="RUNTIME" />
     <orderEntry type="library" scope="TEST" name="http-client" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="easymock" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />

platform/polySymbols/BUILD.bazel

@@ -28,7 +28,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "@lib//:commons-compress",
     "@lib//:jetbrains-markdown",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/projectModel-api:projectModel",
     "//platform/markdown-utils",
   ]
@@ -61,7 +61,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "@lib//:commons-compress",
     "@lib//:jetbrains-markdown",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/markdown-utils",
     "//platform/testFramework",
     "//java/java-runtime:rt",
@@ -99,7 +99,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "@lib//:commons-compress",
     "@lib//:jetbrains-markdown",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/markdown-utils",
     "//platform/markdown-utils:markdown-utils_test_lib",
     "//platform/testFramework",

platform/polySymbols/intellij.platform.polySymbols.iml

@@ -25,7 +25,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
   </component>

platform/polySymbols/intellij.platform.polySymbols.testFramework.iml

@@ -26,7 +26,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.java.rt" />

platform/polySymbols/intellij.platform.polySymbols.tests.iml

@@ -26,7 +26,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.polySymbols" />

platform/remoteDev-util/BUILD.bazel

@@ -33,7 +33,7 @@ jvm_library(
     "@lib//:jackson-databind",
     "//platform/rd-platform-community:rd-community",
     "//platform/statistics",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/util/progress",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
@@ -85,7 +85,7 @@ jvm_library(
     "//platform/rd-platform-community:rd-community",
     "//platform/statistics",
     "//platform/statistics:statistics_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:junit5",
     "//platform/util/progress",
     "@lib//:junit5Params",

platform/remoteDev-util/intellij.remoteDev.util.iml

@@ -51,7 +51,7 @@
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="module" module-name="intellij.platform.rd.community" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <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" />

platform/script-debugger/protocol/protocol-reader/BUILD.bazel

@@ -7,7 +7,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   deps = [
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/script-debugger/protocol/protocol-reader-runtime",
     "//platform/platform-impl:ide-impl",
     "@lib//:kotlin-stdlib",

platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml

@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.scriptDebugger.protocolReaderRuntime" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />

platform/tasks-platform-impl/BUILD.bazel

@@ -22,7 +22,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/platform-api:ide",
     "//platform/vcs-api:vcs",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
     "//platform/execution-impl",

platform/tasks-platform-impl/intellij.platform.tasks.impl.iml

@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />

platform/testFramework/ui/BUILD.bazel

@@ -24,7 +24,7 @@ jvm_library(
     "@lib//:netty-codec-http",
     "@lib//:netty-buffer",
     "@lib//:platform-test_framework-ui-intellij-remoterobot-robot-server-core",
-    "@lib//:gson",
+    "//libraries/gson",
   ],
   exports = [
     "@lib//:platform-test_framework-ui-intellij-remoterobot-remote-fixtures",

platform/testFramework/ui/intellij.platform.testFramework.ui.iml

@@ -148,6 +148,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
   </component>
 </module>

platform/vcs-impl/BUILD.bazel

@@ -34,7 +34,7 @@ jvm_library(
     "//jps/model-serialization",
     "//libraries/guava",
     "//platform/lang-impl",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/diff-impl",
     "//platform/refactoring",
     "//platform/vcs-log/api:vcs-log",
@@ -108,7 +108,7 @@ jvm_library(
     "//platform/lang-impl",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/diff-impl",
     "//platform/refactoring",
     "//platform/vcs-log/api:vcs-log",

platform/vcs-impl/intellij.platform.vcs.impl.iml

@@ -56,7 +56,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.vcs.log" />

platform/vcs-log/impl/BUILD.bazel

@@ -40,7 +40,7 @@ jvm_library(
     "//platform/statistics",
     "@lib//:fastutil-min",
     "//platform/core-ui",
-    "@lib//:gson",
+    "//libraries/gson",
     "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:kotlinx-coroutines-guava",
@@ -99,7 +99,7 @@ jvm_library(
     "//platform/statistics:statistics_test_lib",
     "@lib//:fastutil-min",
     "//platform/core-ui",
-    "@lib//:gson",
+    "//libraries/gson",
     "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:kotlinx-coroutines-guava",

platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml

@@ -41,7 +41,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-guava" level="project" />

plugins/compilation-charts/jps-plugin/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
   deps = [
     "//jps/jps-builders:build",
     "//platform/util",
-    "@lib//:gson",
+    "//libraries/gson",
     "//jps/model-api:model",
   ]
 )

plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml

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

plugins/editorconfig/backend/BUILD.bazel

@@ -39,7 +39,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
     "@lib//:kotlin-reflect",
-    "@lib//:gson",
+    "//libraries/gson",
     "//spellchecker",
     "//platform/indexing-impl",
     "@lib//:automaton",
@@ -81,7 +81,7 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "@lib//:kotlin-reflect",
-    "@lib//:gson",
+    "//libraries/gson",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
     "//platform/indexing-impl",

plugins/editorconfig/backend/intellij.editorconfig.backend.iml

@@ -50,7 +50,7 @@
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="library" name="automaton" level="project" />

plugins/evaluation-plugin/BUILD.bazel

@@ -37,7 +37,7 @@ jvm_library(
     "//platform/service-container",
     "//platform/ml-api:ml",
     "@lib//:clikt",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:commons-text",
     "//platform/warmup",
     "@lib//:kotlinx-coroutines-core",
@@ -61,7 +61,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl_test_lib",
     "//libraries/mockito",
     "@lib//:junit5",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/evaluation-plugin/languages",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",

plugins/evaluation-plugin/core/BUILD.bazel

@@ -15,7 +15,7 @@ jvm_library(
   resources = [":core_resources"],
   deps = [
     "@lib//:kotlin-stdlib",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:commons-compress",
     "@lib//:kotlinx-html-jvm",
     "@lib//:commons-lang3",

plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml

@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="kotlinx-html-jvm" level="project" />
     <orderEntry type="library" name="commons-lang3" level="project" />

plugins/evaluation-plugin/intellij.evaluationPlugin.iml

@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
     <orderEntry type="module" module-name="intellij.platform.ml" />
     <orderEntry type="library" name="clikt" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="commons-text" level="project" />
     <orderEntry type="module" module-name="intellij.platform.warmup" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />

plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml

@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="module" module-name="intellij.evaluationPlugin.languages" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.evaluationPlugin.languages.python" scope="TEST" />

plugins/git4idea/BUILD.bazel

@@ -68,7 +68,7 @@ jvm_library(
     "//platform/diff-impl",
     "@lib//:jackson",
     "@lib//:jackson-databind",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:xz",
     "@lib//:stream_ex",
     "//platform/statistics",
@@ -172,7 +172,7 @@ jvm_library(
     "//platform/diff-impl",
     "@lib//:jackson",
     "@lib//:jackson-databind",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:xz",
     "@lib//:stream_ex",
     "//platform/statistics",

plugins/git4idea/intellij.vcs.git.iml

@@ -83,7 +83,7 @@
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="xz" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />

plugins/github/github-core/BUILD.bazel

@@ -78,7 +78,7 @@ jvm_library(
     "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided",
     "//platform/util/coroutines",
     "//platform/platform-impl/ui",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/dvcs-impl/shared",
     "//platform/ide-core-impl",
     "//platform/vcs-impl/shared",
@@ -158,7 +158,7 @@ jvm_library(
     "@lib//:io-mockk",
     "@lib//:io-mockk-jvm",
     "//platform/platform-impl/ui",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:classgraph",
     "@lib//:assert_j",
     "@lib//:kotlin-reflect",

plugins/github/github-core/intellij.vcs.github.iml

@@ -90,7 +90,7 @@
     <orderEntry type="library" scope="TEST" name="io.mockk" level="project" />
     <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.ui" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" scope="TEST" name="classgraph" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />

plugins/gradle/BUILD.bazel

@@ -44,7 +44,7 @@ jvm_library(
     "@lib//:slf4j-jdk14",
     "//platform/ide-core-impl",
     "@lib//:gradle",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/object-serializer:objectSerializer-annotations",
     "@lib//:ion",
     "@lib//:stream_ex",
@@ -167,7 +167,7 @@ jvm_library(
     "//platform/xdebugger-api:debugger",
     "//platform/smRunner",
     "//platform/smRunner:smRunner_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "//libraries/guava",
     "//platform/eel",
     "//platform/eel-provider",

plugins/gradle/intellij.gradle.iml

@@ -32,7 +32,7 @@
     <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" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="library" name="ion" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />

plugins/gradle/intellij.gradle.tests.iml

@@ -61,7 +61,7 @@
     <orderEntry type="module" module-name="intellij.android.gradle.dsl.groovy" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.eel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />

plugins/gradle/java/BUILD.bazel

@@ -49,7 +49,7 @@ jvm_library(
     "//java/openapi:java",
     "//java/java-impl:impl",
     "//platform/smRunner",
-    "@lib//:gson",
+    "//libraries/gson",
     "//jps/jps-builders:build",
     "//plugins/gradle/tooling-extension-impl:toolingExtension-impl",
     "@lib//:x_stream",

plugins/gradle/java/intellij.gradle.java.iml

@@ -45,7 +45,7 @@
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="library" scope="RUNTIME" name="Ant" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
     <orderEntry type="library" name="XStream" level="project" />

plugins/gradle/jps-plugin/BUILD.bazel

@@ -22,7 +22,7 @@ jvm_library(
     "//jps/model-serialization",
     "@lib//:gradle",
     "@lib//:gradle-jps-ant",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/groovy/jps-plugin:jps",
     "@lib//:fastutil-min",
     "//platform/util/jdom",
@@ -45,7 +45,7 @@ jvm_library(
     "//jps/model-serialization",
     "@lib//:gradle",
     "@lib//:gradle-jps-ant",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/groovy/jps-plugin:jps",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",

plugins/gradle/jps-plugin/intellij.gradle.jps.iml

@@ -50,7 +50,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.groovy.jps" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="fastutil-min" level="project" />

plugins/gradle/tooling-extension-impl/BUILD.bazel

@@ -29,7 +29,7 @@ jvm_library(
     "//platform/external-system-rt:externalSystem-rt",
     "//plugins/gradle/tooling-extension-api:toolingExtension",
     "@lib//:gradle",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/object-serializer:objectSerializer-annotations",
     "@lib//:ion",
     "//platform/util-rt",

plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml

@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="library" name="Gradle" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
     <orderEntry type="library" name="ion" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.rt" />

plugins/kotlin/base/facet/BUILD.bazel

@@ -39,7 +39,7 @@ jvm_library(
     "//java/java-impl:impl",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
-    "@lib//:gson",
+    "//libraries/gson",
   ]
 )
 ### auto-generated section `build kotlin.base.facet` end

plugins/kotlin/base/facet/kotlin.base.facet.iml

@@ -34,6 +34,6 @@
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
   </component>
 </module>

plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel

@@ -87,7 +87,7 @@ jvm_library(
     "@lib//:kotlinc-low-level-api-fir",
     "@lib//:kotlinc-kotlin-compiler-tests",
     "@lib//:kotlin-base-fir-analysis-api-platform-ehcache-sizeof",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/kotlin/base/util",
     "//plugins/kotlin/base/util:util_test_lib",
     "//plugins/kotlin/base/project-structure",

plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml

@@ -61,7 +61,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.project-structure" />
     <orderEntry type="module" module-name="kotlin.base.analysis" />

plugins/kotlin/base/fir/project-structure/BUILD.bazel

@@ -87,7 +87,7 @@ jvm_library(
     "//plugins/kotlin/base/facet",
     "//plugins/kotlin/tests-common:tests-common_test_lib",
     "//plugins/kotlin/test-framework:test-framework_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlinc-analysis-api-impl-base",
     "@lib//:kotlinc-kotlin-compiler-tests",
     "//plugins/kotlin/base/plugin",

plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml

@@ -50,7 +50,7 @@
     <orderEntry type="module" module-name="kotlin.base.facet" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="library" name="kotlinc.analysis-api-impl-base" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
     <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />

plugins/kotlin/base/util/BUILD.bazel

@@ -40,7 +40,7 @@ jvm_library(
     "//java/java-analysis-impl:analysis-impl",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/core-ui",
     "//plugins/kotlin/base/resources:kotlin-base-resources",
     "@lib//:kotlinc-analysis-api",
@@ -76,7 +76,7 @@ jvm_library(
     "//java/java-analysis-impl:analysis-impl",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/core-ui",
     "//plugins/kotlin/base/resources:kotlin-base-resources",
     "@lib//:kotlinc-analysis-api",

plugins/kotlin/base/util/kotlin.base.util.iml

@@ -46,7 +46,7 @@
     <orderEntry type="module" module-name="intellij.java.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="kotlin.base.resources" />
     <orderEntry type="library" name="kotlinc.analysis-api" level="project" />

plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel

@@ -20,7 +20,7 @@ jvm_library(
     "//java/testFramework",
     "@lib//:kotlin-stdlib",
     "@lib//:kotlin-reflect",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlinc-analysis-api",
     "@lib//:kotlinc-kotlin-compiler-tests",
     "//plugins/kotlin/base/util",

plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml

@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinc.analysis-api" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
     <orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />

plugins/kotlin/compiler-reference-index/tests/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
     "@lib//:kotlin-reflect",
     "@lib//:kotlinc-kotlin-compiler-common",
     "@lib//:kotlinc-kotlin-compiler-tests",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:junit4",
     "//java/java-indexing-api:indexing",
     "//jps/model-api:model",

plugins/kotlin/compiler-reference-index/tests/kotlin.compiler-reference-index.tests.iml

@@ -11,7 +11,7 @@
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.java.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />

plugins/kotlin/completion/tests-k1/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "@lib//:kotlinc-kotlin-compiler-tests",
     "//libraries/guava",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/kotlin/base/plugin",
     "//plugins/kotlin/base/plugin:plugin_test_lib",
     "//java/testFramework",

plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml

@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />

plugins/kotlin/completion/tests-shared/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//plugins/kotlin/base/test:test_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "//plugins/kotlin/base/plugin",
     "//plugins/kotlin/base/plugin:plugin_test_lib",
     "//plugins/kotlin/base/util",

plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml

@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />

plugins/kotlin/idea/BUILD.bazel

@@ -64,7 +64,7 @@ jvm_library(
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView-impl",
     "//platform/util/jdom",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/editor-ui-ex:editor-ex",
     "@lib//:asm",
     "@lib//:kotlinc-kotlin-scripting-compiler-impl",

plugins/kotlin/idea/kotlin.idea.iml

@@ -45,7 +45,7 @@
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />

plugins/kotlin/idea/tests/BUILD.bazel

@@ -52,7 +52,7 @@ jvm_library(
     "@lib//:kotlin-test",
     "//platform/structure-view-impl:structureView-impl",
     "//platform/usageView",
-    "@lib//:gson",
+    "//libraries/gson",
     "//libraries/guava",
     "@lib//:fastutil-min",
     "//platform/usageView-impl",

plugins/kotlin/idea/tests/kotlin.idea.tests.iml

@@ -43,7 +43,7 @@
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
-    <orderEntry type="library" scope="TEST" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.guava" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />

plugins/kotlin/jvm-debugger/core/BUILD.bazel

@@ -65,7 +65,7 @@ jvm_library(
     "//platform/statistics",
     "//platform/util",
     "//plugins/kotlin/base/resources:kotlin-base-resources",
-    "@lib//:gson",
+    "//libraries/gson",
     "//java/debugger/shared",
     "//platform/util/jdom",
     "//java/java-runtime:rt",

plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml

@@ -64,7 +64,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="kotlin.base.resources" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.java.rt" />

plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel

@@ -30,7 +30,7 @@ jvm_library(
     "//java/debugger/openapi:java-debugger",
     "@lib//:kotlinc-analysis-api",
     "@lib//:maven-resolver-provider",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:asm",
     "//platform/analysis-api:analysis",
     "//platform/util/concurrency",

plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.java.debugger" />
     <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
     <orderEntry type="library" name="maven-resolver-provider" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />

plugins/kotlin/jvm/shared/BUILD.bazel

@@ -34,7 +34,7 @@ jvm_library(
     "//platform/lvcs-api:lvcs",
     "//platform/projectModel-api:projectModel",
     "//platform/util/jdom",
-    "@lib//:gson",
+    "//libraries/gson",
     "@lib//:kotlinc-kotlin-compiler-common",
     "//platform/platform-impl:ide-impl",
     "//plugins/kotlin/base/compiler-configuration",

plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml

@@ -32,7 +32,7 @@
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />

plugins/kotlin/maven/BUILD.bazel

@@ -17,7 +17,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinc-kotlin-compiler-common",
     "@lib//:kotlinc-kotlin-jps-common",
-    "@lib//:gson",
+    "//libraries/gson",
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",

plugins/kotlin/maven/kotlin.maven.iml

@@ -11,7 +11,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />

plugins/kotlin/maven/tests/BUILD.bazel

@@ -28,7 +28,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
-    "@lib//:gson",
+    "//libraries/gson",
     "//xml/xml-psi-api:psi",
     "//plugins/kotlin/plugin/k1",
     "//java/testFramework",

plugins/kotlin/maven/tests/kotlin.maven.tests.iml

@@ -21,7 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.plugin.k1" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />