From 0272d6a0c7b7583db88d323cd05f6c174083f321 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sat, 4 Oct 2025 20:39:14 +0200 Subject: [PATCH] IJ-MR-175479 IJ-CR-146078 IJPL-209476 miglayout-swing, mvstore, proxy-vole, rhino, winp GitOrigin-RevId: 18f6ef6f31cc80b26bca98a7ab025e2ade284102 --- .idea/modules.xml | 12 +++++++++--- build/bazel-generated-file-list.txt | 8 ++++++++ ...llij.platform.jps.build.dependencyGraph.iml | 2 +- java/compiler/forms-compiler/BUILD.bazel | 4 ++-- .../intellij.java.guiForms.compiler.iml | 2 +- java/compiler/impl/BUILD.bazel | 4 ++-- .../impl/intellij.java.compiler.impl.iml | 4 ++-- java/compiler/instrumentation-util/BUILD.bazel | 2 +- ...ellij.java.compiler.instrumentationUtil.iml | 2 +- java/compiler/javac2/BUILD.bazel | 2 +- .../javac2/intellij.java.compiler.antTasks.iml | 2 +- java/debugger/impl/BUILD.bazel | 4 ++-- .../impl/intellij.java.debugger.impl.iml | 2 +- java/execution/impl/BUILD.bazel | 2 +- .../impl/intellij.java.execution.impl.iml | 2 +- java/idea-ui/BUILD.bazel | 2 +- java/idea-ui/intellij.java.ui.iml | 2 +- java/java-analysis-impl/BUILD.bazel | 2 +- .../intellij.java.analysis.impl.iml | 2 +- java/java-frontback-psi-impl/BUILD.bazel | 2 +- .../intellij.java.frontback.psi.impl.iml | 2 +- java/java-impl-inspections/BUILD.bazel | 2 +- .../intellij.java.impl.inspections.iml | 2 +- java/java-psi-impl/BUILD.bazel | 2 +- java/java-psi-impl/intellij.java.psi.impl.iml | 2 +- java/java-tests/BUILD.bazel | 2 +- java/java-tests/intellij.java.tests.iml | 2 +- java/langInjection/jps/BUILD.bazel | 2 +- .../jps/intellij.java.langInjection.jps.iml | 2 +- java/testFramework/BUILD.bazel | 2 +- .../intellij.java.testFramework.iml | 2 +- jps/jps-builders/BUILD.bazel | 8 ++++---- .../intellij.platform.jps.build.iml | 4 ++-- .../intellij.platform.jps.build.tests.iml | 4 ++-- libraries/README.md | 4 ++-- libraries/asm/BUILD.bazel | 18 ++++++++++++++++++ libraries/asm/intellij.libraries.asm.iml | 12 ++++++++++++ .../asm/resources/intellij.libraries.asm.xml | 2 ++ libraries/miglayout-swing/BUILD.bazel | 18 ++++++++++++++++++ .../intellij.libraries.miglayout.swing.iml | 12 ++++++++++++ .../intellij.libraries.miglayout.swing.xml | 2 ++ libraries/mvstore/BUILD.bazel | 18 ++++++++++++++++++ .../mvstore/intellij.libraries.mvstore.iml | 12 ++++++++++++ .../resources/intellij.libraries.mvstore.xml | 2 ++ libraries/proxy-vole/BUILD.bazel | 18 ++++++++++++++++++ .../intellij.libraries.proxy.vole.iml | 12 ++++++++++++ .../intellij.libraries.proxy.vole.xml | 2 ++ libraries/rhino/BUILD.bazel | 18 ++++++++++++++++++ libraries/rhino/intellij.libraries.rhino.iml | 12 ++++++++++++ .../resources/intellij.libraries.rhino.xml | 2 ++ libraries/winp/BUILD.bazel | 18 ++++++++++++++++++ libraries/winp/intellij.libraries.winp.iml | 12 ++++++++++++ .../winp/resources/intellij.libraries.winp.xml | 2 ++ platform/build-scripts/BUILD.bazel | 2 +- .../intellij.platform.buildScripts.iml | 2 +- .../intellij/build/impl/JarPackager.kt | 9 ++------- .../intellij/build/impl/libraries/libraries.kt | 8 ++++++++ .../python/PythonCommunityPluginModules.kt | 1 - platform/collaboration-tools/BUILD.bazel | 4 ++-- .../intellij.platform.collaborationTools.iml | 2 +- platform/dvcs-impl/BUILD.bazel | 4 ++-- .../intellij.platform.vcs.dvcs.impl.iml | 2 +- platform/execution-impl/BUILD.bazel | 2 +- .../intellij.platform.execution.impl.iml | 2 +- platform/lang-impl/BUILD.bazel | 4 ++-- .../lang-impl/intellij.platform.lang.impl.iml | 4 ++-- platform/platform-impl/BUILD.bazel | 12 ++++++------ .../intellij.platform.ide.impl.iml | 6 +++--- platform/platform-impl/internal/BUILD.bazel | 2 +- .../intellij.platform.ide.internal.iml | 2 +- .../platform-impl/ui-inspector/BUILD.bazel | 2 +- .../intellij.platform.ide.ui.inspector.iml | 2 +- .../src/META-INF/essential-libs.xml | 16 ++++++++++++++++ platform/platform-tests/BUILD.bazel | 4 ++-- .../platform-tests/intellij.platform.tests.iml | 4 ++-- platform/platform-util-io-impl/BUILD.bazel | 6 +++--- .../intellij.platform.ide.util.io.impl.iml | 6 +++--- platform/remoteDev-util/BUILD.bazel | 4 ++-- .../remoteDev-util/intellij.remoteDev.util.iml | 2 +- platform/settings-local/BUILD.bazel | 4 ++-- .../intellij.platform.settings.local.iml | 2 +- platform/testFramework/impl/BUILD.bazel | 2 +- .../intellij.platform.testFramework.impl.iml | 2 +- platform/util-ex/BUILD.bazel | 2 +- platform/util-ex/intellij.platform.util.ex.iml | 2 +- platform/util/BUILD.bazel | 2 +- platform/util/intellij.platform.util.ui.iml | 2 +- platform/vcs-impl/BUILD.bazel | 4 ++-- .../vcs-impl/intellij.platform.vcs.impl.iml | 2 +- platform/vcs-log/impl/BUILD.bazel | 4 ++-- .../impl/intellij.platform.vcs.log.impl.iml | 2 +- platform/whatsNew/BUILD.bazel | 4 ++-- .../whatsNew/intellij.platform.whatsNew.iml | 2 +- platform/xdebugger-impl/BUILD.bazel | 4 ++-- .../intellij.platform.debugger.impl.iml | 2 +- plugins/ByteCodeViewer/BUILD.bazel | 4 ++-- .../intellij.java.byteCodeViewer.iml | 2 +- plugins/IntelliLang/tests/BUILD.bazel | 2 +- .../intellij.platform.langInjection.tests.iml | 2 +- plugins/devkit/jps-plugin/BUILD.bazel | 4 ++-- .../devkit/jps-plugin/intellij.devkit.jps.iml | 2 +- .../jps-plugin/intellij.devkit.jps.tests.iml | 2 +- plugins/git4idea/BUILD.bazel | 4 ++-- plugins/git4idea/intellij.vcs.git.iml | 2 +- plugins/github/github-core/BUILD.bazel | 4 ++-- .../github/github-core/intellij.vcs.github.iml | 2 +- plugins/gitlab/gitlab-core/BUILD.bazel | 4 ++-- .../gitlab/gitlab-core/intellij.vcs.gitlab.iml | 2 +- plugins/gradle/java/BUILD.bazel | 2 +- plugins/gradle/java/intellij.gradle.java.iml | 2 +- plugins/grazie/src/BUILD.bazel | 2 +- plugins/grazie/src/intellij.grazie.core.iml | 2 +- plugins/groovy/BUILD.bazel | 2 +- plugins/groovy/groovy-psi/BUILD.bazel | 2 +- .../groovy/groovy-psi/intellij.groovy.psi.iml | 2 +- plugins/groovy/intellij.groovy.iml | 2 +- plugins/groovy/jps-plugin/BUILD.bazel | 2 +- .../groovy/jps-plugin/intellij.groovy.jps.iml | 2 +- plugins/hg4idea/BUILD.bazel | 4 ++-- plugins/hg4idea/intellij.vcs.hg.iml | 2 +- plugins/ide-startup/importSettings/BUILD.bazel | 4 ++-- .../intellij.ide.startup.importSettings.iml | 2 +- plugins/kotlin/idea/BUILD.bazel | 2 +- plugins/kotlin/idea/kotlin.idea.iml | 2 +- .../kotlin/jvm-debugger/base/util/BUILD.bazel | 2 +- .../util/kotlin.jvm-debugger.base.util.iml | 2 +- .../kotlin/jvm-debugger/core-fe10/BUILD.bazel | 2 +- .../kotlin.jvm-debugger.core-fe10.iml | 2 +- plugins/kotlin/jvm-debugger/core/BUILD.bazel | 2 +- .../core/kotlin.jvm-debugger.core.iml | 2 +- .../kotlin/jvm-debugger/coroutines/BUILD.bazel | 2 +- .../kotlin.jvm-debugger.coroutines.iml | 2 +- plugins/kotlin/jvm-debugger/eval4j/BUILD.bazel | 4 ++-- .../eval4j/kotlin.jvm-debugger.eval4j.iml | 2 +- .../kotlin/jvm-debugger/evaluation/BUILD.bazel | 2 +- .../jvm-debugger/evaluation/k1/BUILD.bazel | 2 +- .../k1/kotlin.jvm-debugger.evaluation.k1.iml | 2 +- .../jvm-debugger/evaluation/k2/BUILD.bazel | 2 +- .../k2/kotlin.jvm-debugger.evaluation.k2.iml | 2 +- .../kotlin.jvm-debugger.evaluation.iml | 2 +- plugins/kotlin/jvm-debugger/test/BUILD.bazel | 2 +- .../kotlin/jvm-debugger/test/k2/BUILD.bazel | 2 +- .../test/k2/kotlin.jvm-debugger.test.k2.iml | 2 +- .../test/kotlin.jvm-debugger.test.iml | 2 +- plugins/kotlin/jvm/shared/BUILD.bazel | 2 +- .../kotlin/jvm/shared/kotlin.jvm.shared.iml | 2 +- .../kotlin-compiler-classpath/BUILD.bazel | 2 +- .../kotlin.util.compiler-classpath.iml | 2 +- .../kotlin/project-configuration/BUILD.bazel | 2 +- .../kotlin.project-configuration.iml | 2 +- .../kotlin/uast/uast-kotlin-base/BUILD.bazel | 2 +- .../kotlin.uast.uast-kotlin-base.iml | 2 +- .../kotlin/uast/uast-kotlin-fir/BUILD.bazel | 2 +- .../kotlin.uast.uast-kotlin.k2.iml | 2 +- .../uast/uast-kotlin-fir/tests/BUILD.bazel | 2 +- .../tests/kotlin.uast.uast-kotlin.k2.tests.iml | 2 +- plugins/kotlin/uast/uast-kotlin/BUILD.bazel | 2 +- .../uast-kotlin/kotlin.uast.uast-kotlin.iml | 2 +- .../kotlin/uast/uast-kotlin/tests/BUILD.bazel | 2 +- .../tests/kotlin.uast.uast-kotlin.tests.iml | 2 +- plugins/markdown/core/BUILD.bazel | 2 +- plugins/markdown/core/intellij.markdown.iml | 2 +- plugins/maven/BUILD.bazel | 2 +- plugins/maven/intellij.maven.iml | 2 +- plugins/repository-search/BUILD.bazel | 4 ++-- .../intellij.repository.search.iml | 2 +- plugins/tasks/tasks-core/BUILD.bazel | 2 +- .../tasks/tasks-core/intellij.tasks.core.iml | 2 +- plugins/tasks/tasks-core/jira/BUILD.bazel | 2 +- .../tasks-core/jira/intellij.tasks.jira.iml | 2 +- plugins/tasks/tasks-tests/BUILD.bazel | 2 +- .../tasks/tasks-tests/intellij.tasks.tests.iml | 2 +- plugins/terminal/BUILD.bazel | 2 +- plugins/terminal/intellij.terminal.iml | 2 +- plugins/ui-designer/BUILD.bazel | 4 ++-- .../intellij.java.guiForms.designer.iml | 2 +- plugins/ui-designer/jps-plugin/BUILD.bazel | 2 +- .../jps-plugin/intellij.java.guiForms.jps.iml | 2 +- .../ui-designer/jps-plugin/tests/BUILD.bazel | 2 +- .../tests/intellij.java.guiForms.jps.tests.iml | 2 +- python/BUILD.bazel | 10 +++++----- python/intellij.python.community.impl.iml | 4 ++-- python/intellij.python.community.tests.iml | 2 +- python/intellij.python.pydev.iml | 4 ++-- 184 files changed, 444 insertions(+), 220 deletions(-) create mode 100644 libraries/asm/BUILD.bazel create mode 100644 libraries/asm/intellij.libraries.asm.iml create mode 100644 libraries/asm/resources/intellij.libraries.asm.xml create mode 100644 libraries/miglayout-swing/BUILD.bazel create mode 100644 libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml create mode 100644 libraries/miglayout-swing/resources/intellij.libraries.miglayout.swing.xml create mode 100644 libraries/mvstore/BUILD.bazel create mode 100644 libraries/mvstore/intellij.libraries.mvstore.iml create mode 100644 libraries/mvstore/resources/intellij.libraries.mvstore.xml create mode 100644 libraries/proxy-vole/BUILD.bazel create mode 100644 libraries/proxy-vole/intellij.libraries.proxy.vole.iml create mode 100644 libraries/proxy-vole/resources/intellij.libraries.proxy.vole.xml create mode 100644 libraries/rhino/BUILD.bazel create mode 100644 libraries/rhino/intellij.libraries.rhino.iml create mode 100644 libraries/rhino/resources/intellij.libraries.rhino.xml create mode 100644 libraries/winp/BUILD.bazel create mode 100644 libraries/winp/intellij.libraries.winp.iml create mode 100644 libraries/winp/resources/intellij.libraries.winp.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index f910e419ccad..2ded30b322db 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -627,6 +627,7 @@ + @@ -654,29 +655,34 @@ + - - + + + + + - + + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 9dbab532a46f..8b501f7cd060 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -339,6 +339,7 @@ jvm/jvm-analysis-refactoring jvm/jvm-analysis-testFramework libraries/aalto-xml libraries/ai.grazie.spell.gec.engine.local +libraries/asm libraries/assertj-core libraries/caffeine libraries/coil @@ -380,13 +381,20 @@ libraries/ktor/utils libraries/lucene.common libraries/lz4 libraries/microba +libraries/miglayout-swing libraries/mockito +libraries/mvstore +libraries/proxy-vole +libraries/rhino libraries/skiko libraries/sshd-osgi libraries/system-stubs-jupiter libraries/testcontainers libraries/testng +libraries/winp libraries/xerces +libraries/xml-rpc +libraries/xstream libraries/xz notebooks/notebook-ui notebooks/visualization diff --git a/build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml b/build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml index f4d3e0279ce4..6afd565351cf 100644 --- a/build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml +++ b/build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml @@ -28,7 +28,7 @@ - + diff --git a/java/compiler/forms-compiler/BUILD.bazel b/java/compiler/forms-compiler/BUILD.bazel index b5244ca98fdc..a13c11699ed8 100644 --- a/java/compiler/forms-compiler/BUILD.bazel +++ b/java/compiler/forms-compiler/BUILD.bazel @@ -10,7 +10,7 @@ jvm_library( deps = [ "//platform/util/jdom", "//platform/forms_rt:java-guiForms-rt", - "@lib//:asm", + "//libraries/asm", "@lib//:jgoodies-forms", "//java/compiler/instrumentation-util", "@lib//:jetbrains-annotations", @@ -27,7 +27,7 @@ jvm_library( deps = [ "//platform/util/jdom", "//platform/forms_rt:java-guiForms-rt", - "@lib//:asm", + "//libraries/asm", "@lib//:jgoodies-forms", "//java/compiler/instrumentation-util", "//platform/util", diff --git a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml index a86b2d8e9635..5594e0cabefa 100644 --- a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml +++ b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml @@ -10,7 +10,7 @@ - + diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index 1176342a58d9..3487e203d26e 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -54,7 +54,7 @@ jvm_library( "//platform/tracing:tracing-rt", "//platform/diagnostic/telemetry", "@lib//:oro_matcher", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlin-stdlib", "@lib//:protobuf", "@lib//:netty-codec-http", @@ -62,7 +62,7 @@ jvm_library( "@lib//:fastutil-min", "@lib//:jps-javac-extension", "@lib//:netty-buffer", - "@lib//:winp", + "//libraries/winp", "//libraries/jackson/jackson", "//libraries/jackson/databind", "@lib//:kotlinx-coroutines-core", diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index 28ce7698dc5b..d057470eb9c1 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/java/compiler/instrumentation-util/BUILD.bazel b/java/compiler/instrumentation-util/BUILD.bazel index 9b82999aceef..49c7aea25c6f 100644 --- a/java/compiler/instrumentation-util/BUILD.bazel +++ b/java/compiler/instrumentation-util/BUILD.bazel @@ -7,6 +7,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), kotlinc_opts = "@community//:k8", - deps = ["@lib//:asm"] + deps = ["//libraries/asm"] ) ### auto-generated section `build intellij.java.compiler.instrumentationUtil` end \ No newline at end of file diff --git a/java/compiler/instrumentation-util/intellij.java.compiler.instrumentationUtil.iml b/java/compiler/instrumentation-util/intellij.java.compiler.instrumentationUtil.iml index 0ece5f1cc920..46d24f662ad8 100644 --- a/java/compiler/instrumentation-util/intellij.java.compiler.instrumentationUtil.iml +++ b/java/compiler/instrumentation-util/intellij.java.compiler.instrumentationUtil.iml @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/java/compiler/javac2/BUILD.bazel b/java/compiler/javac2/BUILD.bazel index 2c4da1934b5d..82c03783988d 100644 --- a/java/compiler/javac2/BUILD.bazel +++ b/java/compiler/javac2/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( "@lib//ant/lib:ant-antlr-provided", "//java/compiler/forms-compiler:java-guiForms-compiler", "//platform/forms_rt:java-guiForms-rt", - "@lib//:asm", + "//libraries/asm", "//java/compiler/instrumentation-util", ], runtime_deps = ["//java/compiler/instrumentation-util-8:java-compiler-instrumentationUtil-java8"] diff --git a/java/compiler/javac2/intellij.java.compiler.antTasks.iml b/java/compiler/javac2/intellij.java.compiler.antTasks.iml index ee1baf57641b..b7e6f7c24e2c 100644 --- a/java/compiler/javac2/intellij.java.compiler.antTasks.iml +++ b/java/compiler/javac2/intellij.java.compiler.antTasks.iml @@ -10,7 +10,7 @@ - + diff --git a/java/debugger/impl/BUILD.bazel b/java/debugger/impl/BUILD.bazel index 291e71ce8de4..f036fb402d92 100644 --- a/java/debugger/impl/BUILD.bazel +++ b/java/debugger/impl/BUILD.bazel @@ -56,7 +56,7 @@ jvm_library( "@lib//:fastutil-min", "//platform/platform-util-io-impl:ide-util-io-impl", "//libraries/gson", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "//platform/build-scripts/downloader", "//platform/feedback", @@ -124,7 +124,7 @@ jvm_library( "@lib//:fastutil-min", "//platform/platform-util-io-impl:ide-util-io-impl", "//libraries/gson", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "//platform/build-scripts/downloader", "//platform/feedback", diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml index 89fb4958c8f2..7cd9c8eba827 100644 --- a/java/debugger/impl/intellij.java.debugger.impl.iml +++ b/java/debugger/impl/intellij.java.debugger.impl.iml @@ -84,7 +84,7 @@ - + diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel index 877471c90aec..46433ade81f0 100644 --- a/java/execution/impl/BUILD.bazel +++ b/java/execution/impl/BUILD.bazel @@ -42,7 +42,7 @@ jvm_library( "//platform/external-system-impl:externalSystem-impl", "//libraries/gson", "//libraries/jackson/jackson", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/vcs-impl", "//platform/vcs-impl/lang", "//platform/util/nanoxml", diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml index 9b931e79efb8..b00099790b5d 100644 --- a/java/execution/impl/intellij.java.execution.impl.iml +++ b/java/execution/impl/intellij.java.execution.impl.iml @@ -36,7 +36,7 @@ - + diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index ff54c4a48547..1f8a2586fc84 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -62,7 +62,7 @@ jvm_library( "//java/java-syntax:syntax", "@lib//:slf4j-api", "//xml/xml-psi-api:psi", - "@lib//:asm", + "//libraries/asm", "//libraries/jackson/jackson", "//libraries/jackson/databind", ] diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml index 0678eeab4f61..44004016e9d7 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -57,7 +57,7 @@ - + diff --git a/java/java-analysis-impl/BUILD.bazel b/java/java-analysis-impl/BUILD.bazel index 3ea47893c731..3ea37080b7f7 100644 --- a/java/java-analysis-impl/BUILD.bazel +++ b/java/java-analysis-impl/BUILD.bazel @@ -39,7 +39,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//xml/xml-psi-impl:psi-impl", "//platform/platform-api:ide", - "@lib//:asm", + "//libraries/asm", "@lib//:stream_ex", "@lib//:kotlin-stdlib", "//java/openapi:java", diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml index e16ac6472aa0..400cf8cecec2 100644 --- a/java/java-analysis-impl/intellij.java.analysis.impl.iml +++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml @@ -42,7 +42,7 @@ - + diff --git a/java/java-frontback-psi-impl/BUILD.bazel b/java/java-frontback-psi-impl/BUILD.bazel index 3c15c8788dc6..eb2739657add 100644 --- a/java/java-frontback-psi-impl/BUILD.bazel +++ b/java/java-frontback-psi-impl/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi", "//platform/core-api:core", "//platform/core-impl", - "@lib//:asm", + "//libraries/asm", "@lib//:stream_ex", "//platform/util", "@lib//:fastutil-min", diff --git a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml index f563f9deaba5..d22553c23279 100644 --- a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml +++ b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml @@ -34,7 +34,7 @@ - + diff --git a/java/java-impl-inspections/BUILD.bazel b/java/java-impl-inspections/BUILD.bazel index 7222c9e904c7..31d58015b6fb 100644 --- a/java/java-impl-inspections/BUILD.bazel +++ b/java/java-impl-inspections/BUILD.bazel @@ -20,7 +20,7 @@ jvm_library( "@lib//:fastutil-min", "//platform/ide-core-impl", "//java/compiler/openapi:java-compiler", - "@lib//:asm", + "//libraries/asm", "//java/java-impl-refactorings:impl-refactorings", "//platform/indexing-api:indexing", "//jps/model-api:model", diff --git a/java/java-impl-inspections/intellij.java.impl.inspections.iml b/java/java-impl-inspections/intellij.java.impl.inspections.iml index 5add1cfe7421..95812f2ac562 100644 --- a/java/java-impl-inspections/intellij.java.impl.inspections.iml +++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml @@ -20,7 +20,7 @@ - + diff --git a/java/java-psi-impl/BUILD.bazel b/java/java-psi-impl/BUILD.bazel index 1956780f1217..24df2802e1a1 100644 --- a/java/java-psi-impl/BUILD.bazel +++ b/java/java-psi-impl/BUILD.bazel @@ -19,7 +19,7 @@ jvm_library( "//java/java-frontback-psi-impl:frontback-psi-impl", "//platform/core-api:core", "//platform/core-impl", - "@lib//:asm", + "//libraries/asm", "//platform/util", "@lib//:stream_ex", "@lib//:fastutil-min", diff --git a/java/java-psi-impl/intellij.java.psi.impl.iml b/java/java-psi-impl/intellij.java.psi.impl.iml index e4e88bb2712a..9a2061bedaa3 100644 --- a/java/java-psi-impl/intellij.java.psi.impl.iml +++ b/java/java-psi-impl/intellij.java.psi.impl.iml @@ -28,7 +28,7 @@ - + diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index c9cf97ff5b7e..a9e1334f38ec 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -140,7 +140,7 @@ jvm_library( "//platform/util/coroutines", "//platform/navbar/testFramework", "//java/unscramble", - "@lib//:asm", + "//libraries/asm", "//plugins/gradle", "//platform/todo", "//platform/statistics/testFramework", diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index a34c56bdf150..90fbc4df7798 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -113,7 +113,7 @@ - + diff --git a/java/langInjection/jps/BUILD.bazel b/java/langInjection/jps/BUILD.bazel index a16f55e9a276..a82c73e6853c 100644 --- a/java/langInjection/jps/BUILD.bazel +++ b/java/langInjection/jps/BUILD.bazel @@ -21,7 +21,7 @@ jvm_library( "//platform/util", "//java/compiler/instrumentation-util", "//jps/model-serialization", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "@lib//:jetbrains-annotations", ] diff --git a/java/langInjection/jps/intellij.java.langInjection.jps.iml b/java/langInjection/jps/intellij.java.langInjection.jps.iml index 704c493f8bb7..7e0a4df607d3 100644 --- a/java/langInjection/jps/intellij.java.langInjection.jps.iml +++ b/java/langInjection/jps/intellij.java.langInjection.jps.iml @@ -30,7 +30,7 @@ - + diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel index a974194ab7d9..4405e431460b 100644 --- a/java/testFramework/BUILD.bazel +++ b/java/testFramework/BUILD.bazel @@ -49,7 +49,7 @@ jvm_library( "//platform/core-ui", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", - "@lib//:asm", + "//libraries/asm", "@lib//:org-codehaus-groovy-groovy", "//java/java-impl-refactorings:impl-refactorings", "//platform/xdebugger-impl:debugger-impl", diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml index 2e19cb4463c2..1bd9fa637b3d 100644 --- a/java/testFramework/intellij.java.testFramework.iml +++ b/java/testFramework/intellij.java.testFramework.iml @@ -46,7 +46,7 @@ - + diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index 70647a9ef62f..b0f55853614e 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -20,7 +20,7 @@ jvm_library( "//java/compiler/forms-compiler:java-guiForms-compiler", "//java/compiler/instrumentation-util", "//aether-dependency-resolver", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "//platform/util/nanoxml", "@lib//:jgoodies-forms", @@ -41,7 +41,7 @@ jvm_library( "@lib//:kotlin-stdlib-provided", "//libraries/hash4j", "@lib//:jetbrains-annotations", - "@lib//:mvstore", + "//libraries/mvstore", "@lib//:netty-jps-provided", "@lib//:maven-resolver-provider", "@lib//:http-client", @@ -92,7 +92,7 @@ jvm_library( "//java/compiler/instrumentation-util", "@lib//:ecj-4-25", "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "//jps/model-impl", "@lib//:fastutil-min", "//libraries/gson", @@ -101,7 +101,7 @@ jvm_library( "@lib//:assert_j", "//libraries/hash4j", "@lib//:platform-jps-build-tests-jqwik", - "@lib//:mvstore", + "//libraries/mvstore", "@lib//:memoryfilesystem", "//jps/model-test-framework:model-testFramework", ] diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index 85c5bbee2367..fb8390bd6451 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -31,7 +31,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/jps/jps-builders/intellij.platform.jps.build.tests.iml b/jps/jps-builders/intellij.platform.jps.build.tests.iml index bc565ac29781..abad6625ed71 100644 --- a/jps/jps-builders/intellij.platform.jps.build.tests.iml +++ b/jps/jps-builders/intellij.platform.jps.build.tests.iml @@ -22,7 +22,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/libraries/README.md b/libraries/README.md index 75f135ff7b71..7fe97234ee71 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -60,9 +60,9 @@ File: `resources/intellij.libraries.example.lib.xml` **IMPORTANT:** `.xml` files must NOT have a trailing newline at the end of the file -### 4. Register in Essential Libraries (if needed) +### 4. Register in Essential Libraries -If the library should be loaded as an essential embedded module, add it to: +The library module must be added to essential-libs.xml. File: `community/platform/platform-resources/src/META-INF/essential-libs.xml` diff --git a/libraries/asm/BUILD.bazel b/libraries/asm/BUILD.bazel new file mode 100644 index 000000000000..e9faf103b93b --- /dev/null +++ b/libraries/asm/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.asm` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "asm_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "asm", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":asm_resources"], + exports = ["@lib//:asm"], + runtime_deps = ["@lib//:asm"] +) +### auto-generated section `build intellij.libraries.asm` end \ No newline at end of file diff --git a/libraries/asm/intellij.libraries.asm.iml b/libraries/asm/intellij.libraries.asm.iml new file mode 100644 index 000000000000..4643825d924b --- /dev/null +++ b/libraries/asm/intellij.libraries.asm.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/asm/resources/intellij.libraries.asm.xml b/libraries/asm/resources/intellij.libraries.asm.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/asm/resources/intellij.libraries.asm.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/miglayout-swing/BUILD.bazel b/libraries/miglayout-swing/BUILD.bazel new file mode 100644 index 000000000000..92331060c02b --- /dev/null +++ b/libraries/miglayout-swing/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.miglayout.swing` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "miglayout-swing_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "miglayout-swing", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":miglayout-swing_resources"], + exports = ["@lib//:miglayout-swing"], + runtime_deps = ["@lib//:miglayout-swing"] +) +### auto-generated section `build intellij.libraries.miglayout.swing` end \ No newline at end of file diff --git a/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml b/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml new file mode 100644 index 000000000000..648195d42858 --- /dev/null +++ b/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/miglayout-swing/resources/intellij.libraries.miglayout.swing.xml b/libraries/miglayout-swing/resources/intellij.libraries.miglayout.swing.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/miglayout-swing/resources/intellij.libraries.miglayout.swing.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/mvstore/BUILD.bazel b/libraries/mvstore/BUILD.bazel new file mode 100644 index 000000000000..34f811fe85c8 --- /dev/null +++ b/libraries/mvstore/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.mvstore` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "mvstore_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "mvstore", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":mvstore_resources"], + exports = ["@lib//:mvstore"], + runtime_deps = ["@lib//:mvstore"] +) +### auto-generated section `build intellij.libraries.mvstore` end \ No newline at end of file diff --git a/libraries/mvstore/intellij.libraries.mvstore.iml b/libraries/mvstore/intellij.libraries.mvstore.iml new file mode 100644 index 000000000000..b23a2d7a985a --- /dev/null +++ b/libraries/mvstore/intellij.libraries.mvstore.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/mvstore/resources/intellij.libraries.mvstore.xml b/libraries/mvstore/resources/intellij.libraries.mvstore.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/mvstore/resources/intellij.libraries.mvstore.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/proxy-vole/BUILD.bazel b/libraries/proxy-vole/BUILD.bazel new file mode 100644 index 000000000000..09db18871d9b --- /dev/null +++ b/libraries/proxy-vole/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.proxy.vole` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "proxy-vole_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "proxy-vole", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":proxy-vole_resources"], + exports = ["@lib//:proxy-vole"], + runtime_deps = ["@lib//:proxy-vole"] +) +### auto-generated section `build intellij.libraries.proxy.vole` end \ No newline at end of file diff --git a/libraries/proxy-vole/intellij.libraries.proxy.vole.iml b/libraries/proxy-vole/intellij.libraries.proxy.vole.iml new file mode 100644 index 000000000000..459d969f040d --- /dev/null +++ b/libraries/proxy-vole/intellij.libraries.proxy.vole.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/proxy-vole/resources/intellij.libraries.proxy.vole.xml b/libraries/proxy-vole/resources/intellij.libraries.proxy.vole.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/proxy-vole/resources/intellij.libraries.proxy.vole.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/rhino/BUILD.bazel b/libraries/rhino/BUILD.bazel new file mode 100644 index 000000000000..6116e53f377a --- /dev/null +++ b/libraries/rhino/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.rhino` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "rhino_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "rhino", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":rhino_resources"], + exports = ["@lib//:rhino"], + runtime_deps = ["@lib//:rhino"] +) +### auto-generated section `build intellij.libraries.rhino` end \ No newline at end of file diff --git a/libraries/rhino/intellij.libraries.rhino.iml b/libraries/rhino/intellij.libraries.rhino.iml new file mode 100644 index 000000000000..884bc0de29ac --- /dev/null +++ b/libraries/rhino/intellij.libraries.rhino.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/rhino/resources/intellij.libraries.rhino.xml b/libraries/rhino/resources/intellij.libraries.rhino.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/rhino/resources/intellij.libraries.rhino.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/winp/BUILD.bazel b/libraries/winp/BUILD.bazel new file mode 100644 index 000000000000..4a67ba53c743 --- /dev/null +++ b/libraries/winp/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.winp` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "winp_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "winp", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":winp_resources"], + exports = ["@lib//:winp"], + runtime_deps = ["@lib//:winp"] +) +### auto-generated section `build intellij.libraries.winp` end \ No newline at end of file diff --git a/libraries/winp/intellij.libraries.winp.iml b/libraries/winp/intellij.libraries.winp.iml new file mode 100644 index 000000000000..c34ab629360a --- /dev/null +++ b/libraries/winp/intellij.libraries.winp.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/winp/resources/intellij.libraries.winp.xml b/libraries/winp/resources/intellij.libraries.winp.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/winp/resources/intellij.libraries.winp.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index d8647c94fd0a..6be792425994 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -71,7 +71,7 @@ jvm_library( "@lib//:intellij-plugin-structure", "@lib//:tc_service_messages", "@lib//:jsoup", - "@lib//:asm", + "//libraries/asm", "@lib//:platform-build_scripts-spdx-tools-java", "//libraries/hash4j", "@lib//:jbr-api", diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index 18714b340f8a..0a0932a153a9 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -163,7 +163,7 @@ - + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt index e48d9a71f19f..2b9fb5db7c5c 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt @@ -80,7 +80,6 @@ private val libsUsedInJps = setOf( "slf4j-api", "slf4j-jdk14", // see getBuildProcessApplicationClasspath - used in JPS - "lz4-java", "jna", "maven-resolver-provider", "OroMatcher", @@ -93,7 +92,6 @@ private val libsUsedInJps = setOf( "commons-logging", "commons-lang3", "kotlin-stdlib", - "fastutil-min", ) private val presignedLibNames = setOf( @@ -112,6 +110,7 @@ private val notImportantKotlinLibs = setOf( const val rdJarName: String = "rd.jar" // must be sorted + private val predefinedMergeRules = listOf Boolean>>( "groovy.jar" to { it, _ -> it.startsWith("org.codehaus.groovy:") }, "jsch-agent.jar" to { it, _ -> it.startsWith("jsch-agent") }, @@ -121,11 +120,7 @@ private val predefinedMergeRules = listOf (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && filter.isBackendProjectLibrary(name) }, PRODUCT_JAR to { name, filter -> (name.startsWith("License") || name.startsWith("jetbrains.codeWithMe.lobby.server.")) && !filter.isBackendProjectLibrary(name) }, // see ClassPathUtil.getUtilClassPath - UTIL_8_JAR to { it, _ -> - libsUsedInJps.contains(it) || - (it.startsWith("kotlinx-") && !notImportantKotlinLibs.contains(it)) || - it == "kotlin-reflect" - }, + UTIL_8_JAR to { it, _ -> libsUsedInJps.contains(it) || (it.startsWith("kotlinx-") && !notImportantKotlinLibs.contains(it)) }, // used in an external process - see `ConsoleProcessListFetcher.getConsoleProcessCount` UTIL_JAR to { it, _ -> it == "pty4j" || it == "jvm-native-trusted-roots" }, diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt index 938a610b3ba0..f48a151a4597 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt @@ -19,6 +19,7 @@ fun JpsModule.isLibraryModule(): Boolean { */ private val LIBRARY_MODULE_NAMES: Set = setOf( "intellij.libraries.aalto.xml", + "intellij.libraries.asm", "intellij.libraries.assertj.core", "intellij.libraries.caffeine", "intellij.libraries.compose.foundation.desktop", @@ -49,7 +50,14 @@ private val LIBRARY_MODULE_NAMES: Set = setOf( "intellij.libraries.kotlinx.io", "intellij.libraries.skiko", "intellij.libraries.coil", + "intellij.libraries.miglayout.swing", + "intellij.libraries.proxy.vole", + "intellij.libraries.mvstore", + "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", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt index a03a37d674c4..b059586e1bec 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt @@ -14,7 +14,6 @@ object PythonCommunityPluginModules { fun pythonCommunityPluginLayout(body: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout { return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, emptyList()) { spec -> body?.invoke(spec) - spec.withProjectLibrary("XmlRPC") } } diff --git a/platform/collaboration-tools/BUILD.bazel b/platform/collaboration-tools/BUILD.bazel index 7733b8c30948..f4b954e05208 100644 --- a/platform/collaboration-tools/BUILD.bazel +++ b/platform/collaboration-tools/BUILD.bazel @@ -31,7 +31,7 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", "//platform/lang-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:kotlin-stdlib", "//platform/diff-api:diff", "@lib//:fastutil-min", @@ -77,7 +77,7 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", "//platform/lang-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:kotlin-stdlib", "//platform/diff-api:diff", "@lib//:fastutil-min", diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml index 7b30a6d45212..1fa0aac48bf6 100644 --- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml +++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml @@ -27,7 +27,7 @@ - + diff --git a/platform/dvcs-impl/BUILD.bazel b/platform/dvcs-impl/BUILD.bazel index 1398507f2063..d6fc001330bc 100644 --- a/platform/dvcs-impl/BUILD.bazel +++ b/platform/dvcs-impl/BUILD.bazel @@ -33,7 +33,7 @@ jvm_library( "//platform/vcs-api:vcs", "//platform/ide-core-impl", "//platform/dvcs-api:vcs-dvcs", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/util/jdom", "//platform/util:util-ui", @@ -79,7 +79,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//libraries/mockito", "//platform/vcs-tests:vcs-testFramework", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/util/jdom", "//platform/util:util-ui", diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml index 6e124d723c98..860261cd4c07 100644 --- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml +++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml @@ -31,7 +31,7 @@ - + diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel index fb7015ae2cfe..b0997b7cbfca 100644 --- a/platform/execution-impl/BUILD.bazel +++ b/platform/execution-impl/BUILD.bazel @@ -31,7 +31,7 @@ jvm_library( "//platform/statistics", "//platform/platform-impl:ide-impl", "//platform/macro", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/guava", "//platform/refactoring", "//platform/ide-core-impl", diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml index 8991e5f6841e..edfce4ac3415 100644 --- a/platform/execution-impl/intellij.platform.execution.impl.iml +++ b/platform/execution-impl/intellij.platform.execution.impl.iml @@ -50,7 +50,7 @@ - + diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel index ec27b9d0d392..0151664037b0 100644 --- a/platform/lang-impl/BUILD.bazel +++ b/platform/lang-impl/BUILD.bazel @@ -59,8 +59,8 @@ jvm_library( "@lib//:commons-logging", "//platform/diff-impl", "//platform/built-in-server-api:builtInServer", - "@lib//:x_stream", - "@lib//:miglayout-swing", + "//libraries/xstream", + "//libraries/miglayout-swing", "//platform/ide-core/plugins", "@lib//:jna", "//libraries/lz4", diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index 2e3425ffb922..ff300008189b 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -67,8 +67,8 @@ - - + + diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 134326fd2b8c..5cd8365f0524 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -44,10 +44,10 @@ jvm_library( "//jps/model-serialization", "//platform/lang-api:lang", "@lib//:jna", - "@lib//:winp", + "//libraries/winp", "@lib//:swingx", "//platform/core-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/indexing-api:indexing", "//platform/lang-core", "//platform/lvcs-api:lvcs", @@ -83,7 +83,7 @@ jvm_library( "//platform/service-container", "@lib//:jcef", "//platform/statistics", - "@lib//:asm", + "//libraries/asm", "@lib//:jsoup", "//platform/rd-platform-community:rd-community", "@lib//:fastutil-min", @@ -203,10 +203,10 @@ jvm_library( "//jps/model-serialization", "//platform/lang-api:lang", "@lib//:jna", - "@lib//:winp", + "//libraries/winp", "@lib//:swingx", "//platform/core-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/indexing-api:indexing", "//platform/lang-core", "//platform/lvcs-api:lvcs", @@ -244,7 +244,7 @@ jvm_library( "@lib//:jcef", "//platform/statistics", "//platform/statistics:statistics_test_lib", - "@lib//:asm", + "//libraries/asm", "@lib//:jsoup", "//platform/rd-platform-community:rd-community", "@lib//:fastutil-min", diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index 825e171c8289..4725f7ef3998 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -43,10 +43,10 @@ - + - + @@ -85,7 +85,7 @@ - + diff --git a/platform/platform-impl/internal/BUILD.bazel b/platform/platform-impl/internal/BUILD.bazel index 353a2289edb5..1686f2fe470e 100644 --- a/platform/platform-impl/internal/BUILD.bazel +++ b/platform/platform-impl/internal/BUILD.bazel @@ -43,7 +43,7 @@ jvm_library( "//platform/util/jdom", "//platform/service-container", "//libraries/guava", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/kotlinx/serialization/json", "@lib//:fastutil-min", "//libraries/hash4j", diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml index 7ec39ebcbd93..e552970cff40 100644 --- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml +++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml @@ -58,7 +58,7 @@ - + diff --git a/platform/platform-impl/ui-inspector/BUILD.bazel b/platform/platform-impl/ui-inspector/BUILD.bazel index f606016605dc..b4379290b1cd 100644 --- a/platform/platform-impl/ui-inspector/BUILD.bazel +++ b/platform/platform-impl/ui-inspector/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( "//platform/lang-api:lang", "//platform/core-ui", "//platform/ide-core-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/guava", "//platform/projectModel-api:projectModel", "//platform/editor-ui-ex:editor-ex", diff --git a/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml b/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml index da865a2e3704..4123826d017c 100644 --- a/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml +++ b/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml @@ -17,7 +17,7 @@ - + diff --git a/platform/platform-resources/src/META-INF/essential-libs.xml b/platform/platform-resources/src/META-INF/essential-libs.xml index 610f24c3ae7d..df87319be2e8 100644 --- a/platform/platform-resources/src/META-INF/essential-libs.xml +++ b/platform/platform-resources/src/META-INF/essential-libs.xml @@ -7,6 +7,7 @@ + @@ -20,8 +21,23 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index 6c2ee98a6ef3..41b2c38ce86b 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -78,7 +78,7 @@ jvm_library( "@lib//:assertj-swing", "@lib//:snakeyaml", "@lib//:jna", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/object-serializer:objectSerializer-tests_test_lib", "//platform/diff-impl", "//platform/service-container", @@ -149,7 +149,7 @@ jvm_library( "@lib//:ktor-server-cio", "//libraries/io", "//platform/ui.jcef", - "@lib//:rhino", + "//libraries/rhino", "//platform/eel-impl", "@lib//:junit5Pioneer", "//platform/platform-tests/eel-helper", diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index 797401dbe3e3..1bde357a903a 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -66,7 +66,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/platform/platform-util-io-impl/BUILD.bazel b/platform/platform-util-io-impl/BUILD.bazel index 193a6024c7f7..289d0ef52be3 100644 --- a/platform/platform-util-io-impl/BUILD.bazel +++ b/platform/platform-util-io-impl/BUILD.bazel @@ -12,13 +12,13 @@ jvm_library( "//platform/util/base", "//platform/platform-util-io:ide-util-io", "@lib//:pty4j", - "@lib//:winp", + "//libraries/winp", "//platform/util", - "@lib//:proxy-vole", + "//libraries/proxy-vole", "@lib//:jna", "//libraries/jackson/jackson", ], exports = ["//platform/platform-util-io:ide-util-io"], - runtime_deps = ["@lib//:rhino"] + runtime_deps = ["//libraries/rhino"] ) ### auto-generated section `build intellij.platform.ide.util.io.impl` end \ No newline at end of file diff --git a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml index 46a34ff6701b..9f30f9fc6435 100644 --- a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml +++ b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml @@ -12,10 +12,10 @@ - + - - + + diff --git a/platform/remoteDev-util/BUILD.bazel b/platform/remoteDev-util/BUILD.bazel index 99a907b60cec..0268c9e7af04 100644 --- a/platform/remoteDev-util/BUILD.bazel +++ b/platform/remoteDev-util/BUILD.bazel @@ -28,7 +28,7 @@ jvm_library( "@lib//:download-pgp-verifier", "@lib//:bouncy-castle-pgp", "//platform/platform-impl:ide-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/rd-platform-community:rd-community", @@ -79,7 +79,7 @@ jvm_library( "@lib//:download-pgp-verifier", "@lib//:bouncy-castle-pgp", "//platform/platform-impl:ide-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/jackson/jackson", "//libraries/jackson/databind", "//platform/rd-platform-community:rd-community", diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml index a9e29df73d99..07a448a851bb 100644 --- a/platform/remoteDev-util/intellij.remoteDev.util.iml +++ b/platform/remoteDev-util/intellij.remoteDev.util.iml @@ -46,7 +46,7 @@ - + diff --git a/platform/settings-local/BUILD.bazel b/platform/settings-local/BUILD.bazel index 5a22dfe43ba8..988672251d74 100644 --- a/platform/settings-local/BUILD.bazel +++ b/platform/settings-local/BUILD.bazel @@ -37,7 +37,7 @@ jvm_library( "//platform/diagnostic/telemetry", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", - "@lib//:mvstore", + "//libraries/mvstore", "//libraries/jackson/jackson", "@lib//:platform-settings-local-jackson-dataformat-cbor", "//platform/util/jdom", @@ -73,7 +73,7 @@ jvm_library( "//platform/diagnostic/telemetry:telemetry_test_lib", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", - "@lib//:mvstore", + "//libraries/mvstore", "//libraries/jackson/jackson", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", diff --git a/platform/settings-local/intellij.platform.settings.local.iml b/platform/settings-local/intellij.platform.settings.local.iml index f34f5d1337ef..20c406a03a57 100644 --- a/platform/settings-local/intellij.platform.settings.local.iml +++ b/platform/settings-local/intellij.platform.settings.local.iml @@ -46,7 +46,7 @@ - + diff --git a/platform/testFramework/impl/BUILD.bazel b/platform/testFramework/impl/BUILD.bazel index ea24f054188f..be18fe2f1e9c 100644 --- a/platform/testFramework/impl/BUILD.bazel +++ b/platform/testFramework/impl/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "//platform/core-api:core", "//jps/model-api:model", "//platform/testFramework", - "@lib//:asm", + "//libraries/asm", ] ) ### auto-generated section `build intellij.platform.testFramework.impl` end \ No newline at end of file diff --git a/platform/testFramework/impl/intellij.platform.testFramework.impl.iml b/platform/testFramework/impl/intellij.platform.testFramework.impl.iml index e681e39bb8e4..9c90ad165230 100644 --- a/platform/testFramework/impl/intellij.platform.testFramework.impl.iml +++ b/platform/testFramework/impl/intellij.platform.testFramework.impl.iml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/platform/util-ex/BUILD.bazel b/platform/util-ex/BUILD.bazel index 57cebe6aec94..e735fe47bae7 100644 --- a/platform/util-ex/BUILD.bazel +++ b/platform/util-ex/BUILD.bazel @@ -21,7 +21,7 @@ jvm_library( "//libraries/lz4", "//platform/diagnostic", "//platform/util/coroutines", - "@lib//:mvstore", + "//libraries/mvstore", ] ) ### auto-generated section `build intellij.platform.util.ex` end \ No newline at end of file diff --git a/platform/util-ex/intellij.platform.util.ex.iml b/platform/util-ex/intellij.platform.util.ex.iml index 4b912732c75d..254773a61482 100644 --- a/platform/util-ex/intellij.platform.util.ex.iml +++ b/platform/util-ex/intellij.platform.util.ex.iml @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/platform/util/BUILD.bazel b/platform/util/BUILD.bazel index 3a98ad47f763..ce448cbc90e4 100644 --- a/platform/util/BUILD.bazel +++ b/platform/util/BUILD.bazel @@ -191,7 +191,7 @@ jvm_library( "//platform/diagnostic", "//libraries/kotlinx/serialization/core", "@lib//:kotlinx-serialization-protobuf", - "@lib//:mvstore", + "//libraries/mvstore", ] ) ### auto-generated section `build intellij.platform.util.ui` end \ No newline at end of file diff --git a/platform/util/intellij.platform.util.ui.iml b/platform/util/intellij.platform.util.ui.iml index 75c5b7a2dbb1..c79b6f0dce4b 100644 --- a/platform/util/intellij.platform.util.ui.iml +++ b/platform/util/intellij.platform.util.ui.iml @@ -51,6 +51,6 @@ - + \ No newline at end of file diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel index c3d33d10738b..2078ec39a94d 100644 --- a/platform/vcs-impl/BUILD.bazel +++ b/platform/vcs-impl/BUILD.bazel @@ -39,7 +39,7 @@ jvm_library( "//platform/refactoring", "//platform/vcs-log/api:vcs-log", "@lib//:swingx", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/statistics", "//platform/util", @@ -113,7 +113,7 @@ jvm_library( "//platform/refactoring", "//platform/vcs-log/api:vcs-log", "@lib//:swingx", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/statistics", "//platform/statistics:statistics_test_lib", diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml index f9afbf617d58..6e55857913d6 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml @@ -61,7 +61,7 @@ - + diff --git a/platform/vcs-log/impl/BUILD.bazel b/platform/vcs-log/impl/BUILD.bazel index c13df1dad122..d200b1c302ea 100644 --- a/platform/vcs-log/impl/BUILD.bazel +++ b/platform/vcs-log/impl/BUILD.bazel @@ -35,7 +35,7 @@ jvm_library( "//platform/vcs-log/graph-api:vcs-log-graph", "@lib//:kotlin-stdlib", "//platform/util", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/diff-impl", "//platform/statistics", "@lib//:fastutil-min", @@ -93,7 +93,7 @@ jvm_library( "//platform/vcs-tests:vcs-testFramework", "//platform/util", "@lib//:assert_j", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/diff-impl", "//platform/statistics", "//platform/statistics:statistics_test_lib", diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml index 514dad5c8ca6..8e2a363f9c5a 100644 --- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml +++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml @@ -36,7 +36,7 @@ - + diff --git a/platform/whatsNew/BUILD.bazel b/platform/whatsNew/BUILD.bazel index 482e220ab05b..387b92aeeb32 100644 --- a/platform/whatsNew/BUILD.bazel +++ b/platform/whatsNew/BUILD.bazel @@ -34,7 +34,7 @@ jvm_library( "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/ide-core-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", @@ -63,7 +63,7 @@ jvm_library( "//platform/core-ui", "//platform/platform-util-io:ide-util-io", "//platform/ide-core-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml index fbba8652204c..2641cca98c4b 100644 --- a/platform/whatsNew/intellij.platform.whatsNew.iml +++ b/platform/whatsNew/intellij.platform.whatsNew.iml @@ -40,7 +40,7 @@ - + diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel index 615737b3a264..36f27be1bea5 100644 --- a/platform/xdebugger-impl/BUILD.bazel +++ b/platform/xdebugger-impl/BUILD.bazel @@ -54,7 +54,7 @@ jvm_library( "//platform/analysis-impl", "//platform/util/jdom", "@lib//:kotlinx-coroutines-core", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/util/text-matching", "//platform/util/coroutines", "//platform/ide-core-impl", @@ -113,7 +113,7 @@ jvm_library( "//platform/analysis-impl", "//platform/util/jdom", "@lib//:kotlinx-coroutines-core", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/util/text-matching", "//platform/util/coroutines", "//platform/ide-core-impl", diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml index 264621a9c926..668797295719 100644 --- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml +++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml @@ -62,7 +62,7 @@ - + diff --git a/plugins/ByteCodeViewer/BUILD.bazel b/plugins/ByteCodeViewer/BUILD.bazel index 896031150eef..e02557b79584 100644 --- a/plugins/ByteCodeViewer/BUILD.bazel +++ b/plugins/ByteCodeViewer/BUILD.bazel @@ -21,7 +21,7 @@ jvm_library( resources = [":java-byteCodeViewer_resources"], kotlinc_opts = ":custom_java-byteCodeViewer", deps = [ - "@lib//:asm", + "//libraries/asm", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", @@ -47,7 +47,7 @@ jvm_library( kotlinc_opts = ":custom_java-byteCodeViewer", associates = [":java-byteCodeViewer"], deps = [ - "@lib//:asm", + "//libraries/asm", "//platform/analysis-api:analysis", "//platform/editor-ui-api:editor-ui", "//platform/projectModel-api:projectModel", diff --git a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml index 353d7a9b1dbb..4e5a4797eeeb 100644 --- a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml +++ b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml @@ -25,7 +25,7 @@ - + diff --git a/plugins/IntelliLang/tests/BUILD.bazel b/plugins/IntelliLang/tests/BUILD.bazel index 44e5c5721788..548a67ae902b 100644 --- a/plugins/IntelliLang/tests/BUILD.bazel +++ b/plugins/IntelliLang/tests/BUILD.bazel @@ -40,7 +40,7 @@ jvm_library( "//java/compiler/instrumentation-util", "@lib//:assert_j", "//java/langInjection/jps", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "//plugins/IntelliLang/backend", "//plugins/markdown/plugin:plugin-main", diff --git a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml index 3cea0f688617..e1d31351d9cc 100644 --- a/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml +++ b/plugins/IntelliLang/tests/intellij.platform.langInjection.tests.iml @@ -25,7 +25,7 @@ - + diff --git a/plugins/devkit/jps-plugin/BUILD.bazel b/plugins/devkit/jps-plugin/BUILD.bazel index 39323cc76ef0..7734c5cd1fde 100644 --- a/plugins/devkit/jps-plugin/BUILD.bazel +++ b/plugins/devkit/jps-plugin/BUILD.bazel @@ -19,7 +19,7 @@ jvm_library( "//jps/model-serialization", "//jps/jps-builders:build", "//java/compiler/instrumentation-util", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "@community//build:build-javac-rt", "//platform/util", @@ -49,7 +49,7 @@ jvm_library( "//java/testFramework", "//jps/model-serialization:model-serialization-tests_test_lib", "//jps/jps-builders:build", - "@lib//:asm", + "//libraries/asm", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//java/compiler/instrumentation-util", diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml index 5ed3ba4a0ac1..5d88a9478a38 100644 --- a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml +++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml @@ -28,7 +28,7 @@ - + diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml index 0f984b8f8fb0..5b3c3f31d9d8 100644 --- a/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml +++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.tests.iml @@ -15,7 +15,7 @@ - + diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel index d31b856fdaf0..697c085f9ed8 100644 --- a/plugins/git4idea/BUILD.bazel +++ b/plugins/git4idea/BUILD.bazel @@ -72,7 +72,7 @@ jvm_library( "//libraries/xz", "@lib//:stream_ex", "//platform/statistics", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/core-ui", "@lib//:fastutil-min", "//platform/platform-util-io:ide-util-io", @@ -178,7 +178,7 @@ jvm_library( "@lib//:stream_ex", "//platform/statistics", "//platform/statistics:statistics_test_lib", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/core-ui", "@lib//:fastutil-min", "//platform/platform-util-io:ide-util-io", diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 41ac92a2678b..75fa05a9f674 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -87,7 +87,7 @@ - + diff --git a/plugins/github/github-core/BUILD.bazel b/plugins/github/github-core/BUILD.bazel index 12c5e3310768..00e7cb7523e7 100644 --- a/plugins/github/github-core/BUILD.bazel +++ b/plugins/github/github-core/BUILD.bazel @@ -53,7 +53,7 @@ jvm_library( "//libraries/guava", "//platform/credential-store-ui:credentialStore-ui", "//platform/lang-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/jackson/databind", "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/editor-ui-api:editor-ui", @@ -125,7 +125,7 @@ jvm_library( "//libraries/guava", "//platform/credential-store-ui:credentialStore-ui", "//platform/lang-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/jackson/databind", "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/editor-ui-api:editor-ui", diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml index 2a63bc243454..5eb7385fb543 100644 --- a/plugins/github/github-core/intellij.vcs.github.iml +++ b/plugins/github/github-core/intellij.vcs.github.iml @@ -60,7 +60,7 @@ - + diff --git a/plugins/gitlab/gitlab-core/BUILD.bazel b/plugins/gitlab/gitlab-core/BUILD.bazel index 278ea2cad07b..9c3ec4eab87b 100644 --- a/plugins/gitlab/gitlab-core/BUILD.bazel +++ b/plugins/gitlab/gitlab-core/BUILD.bazel @@ -58,7 +58,7 @@ jvm_library( "//platform/vcs-impl", "@lib//:jetbrains-markdown", "//platform/markdown-utils", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/caffeine", "//platform/diff-impl", "//platform/lang-impl", @@ -119,7 +119,7 @@ jvm_library( "@lib//:jetbrains-markdown", "//platform/markdown-utils", "//platform/markdown-utils:markdown-utils_test_lib", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/caffeine", "//platform/diff-impl", "//platform/lang-impl", diff --git a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml index fef6a27723c5..f74569885fde 100644 --- a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml +++ b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml @@ -67,7 +67,7 @@ - + diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel index 996df1d8b584..89b160c5ff83 100644 --- a/plugins/gradle/java/BUILD.bazel +++ b/plugins/gradle/java/BUILD.bazel @@ -52,7 +52,7 @@ jvm_library( "//libraries/gson", "//jps/jps-builders:build", "//plugins/gradle/tooling-extension-impl:toolingExtension-impl", - "@lib//:x_stream", + "//libraries/xstream", "//plugins/groovy/groovy-psi:psi", "//java/execution/openapi:java-execution", "//plugins/maven", diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml index 75929fa98467..5dd9963b8aed 100644 --- a/plugins/gradle/java/intellij.gradle.java.iml +++ b/plugins/gradle/java/intellij.gradle.java.iml @@ -48,7 +48,7 @@ - + diff --git a/plugins/grazie/src/BUILD.bazel b/plugins/grazie/src/BUILD.bazel index 924f10d5e5bb..42cfcf23d499 100644 --- a/plugins/grazie/src/BUILD.bazel +++ b/plugins/grazie/src/BUILD.bazel @@ -35,7 +35,7 @@ jvm_library( "//platform/service-container", "//platform/vcs-impl", "//spellchecker", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/json", "//platform/platform-api:ide", diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index 7760d28230d7..913fd8a6fd94 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -29,7 +29,7 @@ - + diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel index 08c122401774..14904784863a 100644 --- a/plugins/groovy/BUILD.bazel +++ b/plugins/groovy/BUILD.bazel @@ -166,7 +166,7 @@ jvm_library( "@lib//:fastutil-min", "//platform/code-style-impl:codeStyle-impl", "//platform/platform-util-io:ide-util-io", - "@lib//:asm", + "//libraries/asm", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", "//platform/build-scripts/downloader", diff --git a/plugins/groovy/groovy-psi/BUILD.bazel b/plugins/groovy/groovy-psi/BUILD.bazel index d08ec56a0da8..2b5dab7c8559 100644 --- a/plugins/groovy/groovy-psi/BUILD.bazel +++ b/plugins/groovy/groovy-psi/BUILD.bazel @@ -41,7 +41,7 @@ jvm_library( "//platform/core-ui", "//libraries/kotlin-reflect", "@lib//:fastutil-min", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", ], exports = ["@lib//:org-codehaus-groovy-groovy"] diff --git a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml index 872e5aa1fb25..c32bc7c82eee 100644 --- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml +++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml @@ -38,7 +38,7 @@ - + \ No newline at end of file diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml index ca5e2e8b9f98..937dfbc8560a 100644 --- a/plugins/groovy/intellij.groovy.iml +++ b/plugins/groovy/intellij.groovy.iml @@ -71,7 +71,7 @@ - + diff --git a/plugins/groovy/jps-plugin/BUILD.bazel b/plugins/groovy/jps-plugin/BUILD.bazel index fa6b393f4971..15333475c38e 100644 --- a/plugins/groovy/jps-plugin/BUILD.bazel +++ b/plugins/groovy/jps-plugin/BUILD.bazel @@ -25,7 +25,7 @@ jvm_library( "//java/compiler/instrumentation-util", "@lib//:ecj-4-25-provided", "//platform/util-class-loader:util-classLoader", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", diff --git a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml index 20e70f5a7bf6..05127801d63a 100644 --- a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml +++ b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml @@ -34,7 +34,7 @@ - + diff --git a/plugins/hg4idea/BUILD.bazel b/plugins/hg4idea/BUILD.bazel index 5cbea2fff531..d442571fdde5 100644 --- a/plugins/hg4idea/BUILD.bazel +++ b/plugins/hg4idea/BUILD.bazel @@ -32,7 +32,7 @@ jvm_library( "//platform/vcs-log/impl", "//platform/dvcs-api:vcs-dvcs", "//platform/lang-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", @@ -73,7 +73,7 @@ jvm_library( "//platform/dvcs-api:vcs-dvcs", "//platform/lang-impl", "//platform/vcs-tests:vcs-testFramework", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "@lib//:stream_ex", "//platform/core-ui", "//platform/platform-util-io:ide-util-io", diff --git a/plugins/hg4idea/intellij.vcs.hg.iml b/plugins/hg4idea/intellij.vcs.hg.iml index 3a6a9f092272..a0a54fb7c3f7 100644 --- a/plugins/hg4idea/intellij.vcs.hg.iml +++ b/plugins/hg4idea/intellij.vcs.hg.iml @@ -29,7 +29,7 @@ - + diff --git a/plugins/ide-startup/importSettings/BUILD.bazel b/plugins/ide-startup/importSettings/BUILD.bazel index bca7e8256969..de2da0209f4f 100644 --- a/plugins/ide-startup/importSettings/BUILD.bazel +++ b/plugins/ide-startup/importSettings/BUILD.bazel @@ -36,7 +36,7 @@ jvm_library( "//libraries/jackson/databind", "//libraries/jackson/jackson", "//platform/observable", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", "@lib//:jna", @@ -81,7 +81,7 @@ jvm_library( "//libraries/jackson/databind", "//libraries/jackson/jackson", "//platform/observable", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", "@lib//:jna", diff --git a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml index 907b755ccb32..96b6c213b24a 100644 --- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml +++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml @@ -53,7 +53,7 @@ - + diff --git a/plugins/kotlin/idea/BUILD.bazel b/plugins/kotlin/idea/BUILD.bazel index e91b3b02d8b1..4fa0d7a40348 100644 --- a/plugins/kotlin/idea/BUILD.bazel +++ b/plugins/kotlin/idea/BUILD.bazel @@ -66,7 +66,7 @@ jvm_library( "//platform/util/jdom", "//libraries/gson", "//platform/editor-ui-ex:editor-ex", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlinc-kotlin-scripting-compiler-impl", "//platform/observable", "@lib//:kotlinc-kotlin-scripting-common", diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml index db4d7813b00e..b200d7305f20 100644 --- a/plugins/kotlin/idea/kotlin.idea.iml +++ b/plugins/kotlin/idea/kotlin.idea.iml @@ -47,7 +47,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel b/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel index dba7b39f9a1c..2cec09423aaa 100644 --- a/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/base/util/BUILD.bazel @@ -10,7 +10,7 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", - "@lib//:asm", + "//libraries/asm", "//platform/core-api:core", "//platform/projectModel-api:projectModel", "//plugins/kotlin/base/frontend-agnostic", diff --git a/plugins/kotlin/jvm-debugger/base/util/kotlin.jvm-debugger.base.util.iml b/plugins/kotlin/jvm-debugger/base/util/kotlin.jvm-debugger.base.util.iml index c0f3457d7b5b..a1dda692c7c9 100644 --- a/plugins/kotlin/jvm-debugger/base/util/kotlin.jvm-debugger.base.util.iml +++ b/plugins/kotlin/jvm-debugger/base/util/kotlin.jvm-debugger.base.util.iml @@ -10,7 +10,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel b/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel index b47dbc9ac4cc..db030f8924c2 100644 --- a/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel @@ -19,7 +19,7 @@ jvm_library( kotlinc_opts = ":custom_core-fe10", deps = [ "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:stream_ex", "//libraries/caffeine", "@lib//:kotlinc-kotlin-compiler-common", diff --git a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml index 6c42b815e6dc..5a9a3c64ce19 100644 --- a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml +++ b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml @@ -24,7 +24,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/core/BUILD.bazel b/plugins/kotlin/jvm-debugger/core/BUILD.bazel index 44861f27ce74..f9ed283d2ae9 100644 --- a/plugins/kotlin/jvm-debugger/core/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/core/BUILD.bazel @@ -29,7 +29,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-analysis-api-impl-base", - "@lib//:asm", + "//libraries/asm", "@lib//:jb-jdi", "//platform/analysis-api:analysis", "//platform/util/concurrency", diff --git a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml index b3ff8d73e39a..b21f433cd3b0 100644 --- a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml +++ b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml @@ -28,7 +28,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel index 58cd513ec996..a87c06d4ed54 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel @@ -31,7 +31,7 @@ jvm_library( "@lib//:kotlinc-analysis-api", "@lib//:maven-resolver-provider", "//libraries/gson", - "@lib//:asm", + "//libraries/asm", "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", diff --git a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml index 011da17b475d..248800e982ff 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml +++ b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml @@ -36,7 +36,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/eval4j/BUILD.bazel b/plugins/kotlin/jvm-debugger/eval4j/BUILD.bazel index c704b555130e..693ed61f1812 100644 --- a/plugins/kotlin/jvm-debugger/eval4j/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/eval4j/BUILD.bazel @@ -9,7 +9,7 @@ jvm_library( deps = [ "//java/debugger/openapi:java-debugger", "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlinc-kotlin-compiler-common", "//platform/util", "//java/debugger/impl", @@ -25,7 +25,7 @@ jvm_library( deps = [ "//java/debugger/openapi:java-debugger", "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:junit4", "@lib//:kotlinc-kotlin-compiler-common", "//platform/util", diff --git a/plugins/kotlin/jvm-debugger/eval4j/kotlin.jvm-debugger.eval4j.iml b/plugins/kotlin/jvm-debugger/eval4j/kotlin.jvm-debugger.eval4j.iml index 3f97443e25bc..72606766969e 100644 --- a/plugins/kotlin/jvm-debugger/eval4j/kotlin.jvm-debugger.eval4j.iml +++ b/plugins/kotlin/jvm-debugger/eval4j/kotlin.jvm-debugger.eval4j.iml @@ -11,7 +11,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel index 06f78f86d8bc..d2840909b9d8 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( resources = [":evaluation_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-analysis-api-platform-interface", diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel index 9408d02e71c1..ab2e41662757 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/BUILD.bazel @@ -41,7 +41,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", - "@lib//:asm", + "//libraries/asm", "//libraries/guava", "@lib//:kotlinc-kotlin-compiler-ir", "@lib//:kotlinc-analysis-api-fe10", diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml index 049682ca91b5..0dc68dd4ed2a 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml @@ -47,7 +47,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel b/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel index dff039880b88..88d8f516b097 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/evaluation/k2/BUILD.bazel @@ -26,7 +26,7 @@ jvm_library( "//java/java-analysis-impl:analysis-impl", "//plugins/kotlin/jvm-debugger/base/util", "//plugins/kotlin/jvm-debugger/evaluation", - "@lib//:asm", + "//libraries/asm", "//platform/xdebugger-impl:debugger-impl", "//plugins/kotlin/code-insight/impl-base", "//plugins/kotlin/base/psi", diff --git a/plugins/kotlin/jvm-debugger/evaluation/k2/kotlin.jvm-debugger.evaluation.k2.iml b/plugins/kotlin/jvm-debugger/evaluation/k2/kotlin.jvm-debugger.evaluation.k2.iml index 8d7f5840ed97..6949661046f1 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/k2/kotlin.jvm-debugger.evaluation.k2.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/k2/kotlin.jvm-debugger.evaluation.k2.iml @@ -20,7 +20,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml index d0b34fca4c4e..63e85cbbcb83 100644 --- a/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml +++ b/plugins/kotlin/jvm-debugger/evaluation/kotlin.jvm-debugger.evaluation.iml @@ -9,7 +9,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/test/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/BUILD.bazel index 7e524299b3f5..072e4150a70a 100644 --- a/plugins/kotlin/jvm-debugger/test/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/BUILD.bazel @@ -53,7 +53,7 @@ jvm_library( "//platform/lang-core", "//platform/projectModel-api:projectModel", "//plugins/kotlin/tests-common:tests-common_test_lib", - "@lib//:asm", + "//libraries/asm", "//java/execution/impl", "//libraries/guava", "//java/idea-ui:ui", diff --git a/plugins/kotlin/jvm-debugger/test/k2/BUILD.bazel b/plugins/kotlin/jvm-debugger/test/k2/BUILD.bazel index 4236b7b10783..745ce782c404 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/test/k2/BUILD.bazel @@ -39,7 +39,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlin-reflect", "@lib//:kotlin-test", - "@lib//:asm", + "//libraries/asm", "//platform/core-api:core", "//platform/lang-core", "//libraries/guava", diff --git a/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml b/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml index 403376655a30..1e451c55fc74 100644 --- a/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml +++ b/plugins/kotlin/jvm-debugger/test/k2/kotlin.jvm-debugger.test.k2.iml @@ -13,7 +13,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml index 9bf35b0a7bd2..d8ac96c4cd9f 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml @@ -20,7 +20,7 @@ - + diff --git a/plugins/kotlin/jvm/shared/BUILD.bazel b/plugins/kotlin/jvm/shared/BUILD.bazel index cddcf4e64678..d2a3b9545197 100644 --- a/plugins/kotlin/jvm/shared/BUILD.bazel +++ b/plugins/kotlin/jvm/shared/BUILD.bazel @@ -80,7 +80,7 @@ jvm_library( "//platform/util/coroutines", "//platform/core-api:core", "@lib//:kotlinc-analysis-api", - "@lib//:asm", + "//libraries/asm", "//platform/ide-core-impl", "//platform/ide-core", "//platform/util", diff --git a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml index 96c504a6ec9b..fdad724d7270 100644 --- a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml +++ b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml @@ -78,7 +78,7 @@ - + diff --git a/plugins/kotlin/kotlin-compiler-classpath/BUILD.bazel b/plugins/kotlin/kotlin-compiler-classpath/BUILD.bazel index 030e5899f4f5..e6601e1ac4b6 100644 --- a/plugins/kotlin/kotlin-compiler-classpath/BUILD.bazel +++ b/plugins/kotlin/kotlin-compiler-classpath/BUILD.bazel @@ -8,7 +8,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), deps = [ "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:java_compatibility", "@lib//:javax-inject", "@lib//:vavr", diff --git a/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml b/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml index 29286ae6f958..90c8ae8aabc3 100644 --- a/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml +++ b/plugins/kotlin/kotlin-compiler-classpath/kotlin.util.compiler-classpath.iml @@ -8,7 +8,7 @@ - + diff --git a/plugins/kotlin/project-configuration/BUILD.bazel b/plugins/kotlin/project-configuration/BUILD.bazel index 7cbce25da6d2..11a658b97748 100644 --- a/plugins/kotlin/project-configuration/BUILD.bazel +++ b/plugins/kotlin/project-configuration/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-kotlin-jps-common", - "@lib//:asm", + "//libraries/asm", "//platform/analysis-api:analysis", "//platform/diff-api:diff", "//platform/editor-ui-api:editor-ui", diff --git a/plugins/kotlin/project-configuration/kotlin.project-configuration.iml b/plugins/kotlin/project-configuration/kotlin.project-configuration.iml index 08c320e92c11..af3914b2a057 100644 --- a/plugins/kotlin/project-configuration/kotlin.project-configuration.iml +++ b/plugins/kotlin/project-configuration/kotlin.project-configuration.iml @@ -12,7 +12,7 @@ - + diff --git a/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel index 769afee87f94..8b9fd11c219c 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-base/BUILD.bazel @@ -9,7 +9,7 @@ jvm_library( kotlinc_opts = "@community//:k11", deps = [ "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlinc-analysis-api", diff --git a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml index 80513edfb835..72af0e720e45 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml +++ b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml @@ -24,7 +24,7 @@ - + diff --git a/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel index 7ff112a7ec9b..e01e462745f5 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-fir/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "@lib//:kotlinc-kotlin-compiler-common", - "@lib//:asm", + "//libraries/asm", "//plugins/kotlin/uast/uast-kotlin-base", "@lib//:kotlinc-analysis-api", "@lib//:kotlinc-analysis-api-k2", diff --git a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml index 1ccf103566ff..f8d7643de975 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml +++ b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml @@ -25,7 +25,7 @@ - + diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel index df1597675e2b..e063cb382a33 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-tests", "//java/testFramework", - "@lib//:asm", + "//libraries/asm", "//plugins/kotlin/uast/uast-kotlin-base", "//plugins/kotlin/uast/uast-kotlin-base/tests:tests_test_lib", "//plugins/kotlin/uast/uast-kotlin-fir:kotlin-uast-uast-kotlin-k2", diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml b/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml index d6d0f6eb2bb0..5a94bfa67f5e 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/kotlin.uast.uast-kotlin.k2.tests.iml @@ -12,7 +12,7 @@ - + diff --git a/plugins/kotlin/uast/uast-kotlin/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin/BUILD.bazel index 4f596068bf75..f80f4cf9b25a 100644 --- a/plugins/kotlin/uast/uast-kotlin/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin/BUILD.bazel @@ -10,7 +10,7 @@ jvm_library( deps = [ "//platform/core-api:core", "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:kotlinc-kotlin-compiler-common", "@lib//:kotlinc-kotlin-compiler-fe10", "//platform/util", diff --git a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml index 6d350122b4ef..4784a7343f25 100644 --- a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml +++ b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml @@ -25,7 +25,7 @@ - + diff --git a/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel b/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel index dfb76dd428ac..a3799fa66ebd 100644 --- a/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel +++ b/plugins/kotlin/uast/uast-kotlin/tests/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( deps = [ "//platform/core-api:core", "@lib//:kotlin-stdlib", - "@lib//:asm", + "//libraries/asm", "@lib//:junit4", "//java/testFramework", "@lib//:kotlin-test", diff --git a/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml b/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml index f2d59136b9b7..ea92bc4cd61d 100644 --- a/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml +++ b/plugins/kotlin/uast/uast-kotlin/tests/kotlin.uast.uast-kotlin.tests.iml @@ -9,7 +9,7 @@ - + diff --git a/plugins/markdown/core/BUILD.bazel b/plugins/markdown/core/BUILD.bazel index b934e69d1cc0..1dad62383466 100644 --- a/plugins/markdown/core/BUILD.bazel +++ b/plugins/markdown/core/BUILD.bazel @@ -46,7 +46,7 @@ jvm_library( "//libraries/jackson/databind", "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/execution-impl", - "@lib//:miglayout-swing", + "//libraries/miglayout-swing", "//platform/platform-api:ide", "//platform/statistics", "//platform/structure-view-impl:structureView-impl", diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml index 6002fb9066ed..3903c13278cd 100644 --- a/plugins/markdown/core/intellij.markdown.iml +++ b/plugins/markdown/core/intellij.markdown.iml @@ -66,7 +66,7 @@ - + diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel index 8cde0c5df9c6..9f3e9e8c7229 100644 --- a/plugins/maven/BUILD.bazel +++ b/plugins/maven/BUILD.bazel @@ -101,7 +101,7 @@ jvm_library( "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry-impl", "//plugins/maven/maven-server-telemetry:server-telemetry", - "@lib//:asm", + "//libraries/asm", "//platform/eel-provider", "//platform/ijent", "//platform/eel-impl", diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 0d48152434d1..8636bd11739a 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -121,7 +121,7 @@ - + diff --git a/plugins/repository-search/BUILD.bazel b/plugins/repository-search/BUILD.bazel index 6be972316f63..acd99be39693 100644 --- a/plugins/repository-search/BUILD.bazel +++ b/plugins/repository-search/BUILD.bazel @@ -51,7 +51,7 @@ jvm_library( "//libraries/ktor/client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", - "@lib//:mvstore", + "//libraries/mvstore", ], exports = ["@lib//:package-search-api-client"] ) @@ -91,7 +91,7 @@ jvm_library( "//libraries/ktor/client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", - "@lib//:mvstore", + "//libraries/mvstore", ], exports = ["@lib//:package-search-api-client"] ) diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml index b2d8d4ccae0d..137f99bc7278 100644 --- a/plugins/repository-search/intellij.repository.search.iml +++ b/plugins/repository-search/intellij.repository.search.iml @@ -56,6 +56,6 @@ - + \ No newline at end of file diff --git a/plugins/tasks/tasks-core/BUILD.bazel b/plugins/tasks/tasks-core/BUILD.bazel index 86a7e429d404..aff4340ad738 100644 --- a/plugins/tasks/tasks-core/BUILD.bazel +++ b/plugins/tasks/tasks-core/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( "//platform/lang-impl", "//platform/vcs-impl", "//plugins/tasks/tasks-core/lib:axis-1-4", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//libraries/gson", "//xml/impl", "//platform/core-api:core", diff --git a/plugins/tasks/tasks-core/intellij.tasks.core.iml b/plugins/tasks/tasks-core/intellij.tasks.core.iml index f7af713923aa..b3e5b4f950e2 100644 --- a/plugins/tasks/tasks-core/intellij.tasks.core.iml +++ b/plugins/tasks/tasks-core/intellij.tasks.core.iml @@ -30,7 +30,7 @@ - + diff --git a/plugins/tasks/tasks-core/jira/BUILD.bazel b/plugins/tasks/tasks-core/jira/BUILD.bazel index 9d4035526725..d9079d1ef6c1 100644 --- a/plugins/tasks/tasks-core/jira/BUILD.bazel +++ b/plugins/tasks/tasks-core/jira/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( "//platform/lang-impl", "//platform/tasks-platform-impl:tasks-impl", "//plugins/tasks/tasks-api:tasks", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//libraries/gson", "//platform/core-ui", "//platform/util/jdom", diff --git a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml index ea484edace8c..ff4c08790921 100644 --- a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml +++ b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml @@ -19,7 +19,7 @@ - + diff --git a/plugins/tasks/tasks-tests/BUILD.bazel b/plugins/tasks/tasks-tests/BUILD.bazel index 5c18c9e5025e..1400b1c58761 100644 --- a/plugins/tasks/tasks-tests/BUILD.bazel +++ b/plugins/tasks/tasks-tests/BUILD.bazel @@ -31,7 +31,7 @@ jvm_library( "//java/testFramework", "//platform/vcs-impl", "//platform/vcs-impl:vcs-impl_test_lib", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//java/debugger/openapi:java-debugger", "//plugins/xslt-debugger", "//platform/xdebugger-impl:debugger-impl", diff --git a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml index 069e3ac1e252..f12e46cb8de4 100644 --- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml +++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml @@ -22,7 +22,7 @@ - + diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel index 0c6958f83e2d..a71414faf237 100644 --- a/plugins/terminal/BUILD.bazel +++ b/plugins/terminal/BUILD.bazel @@ -33,7 +33,7 @@ jvm_library( "@lib//:jediterm-core", "@lib//:jediterm-ui", "//platform/execution-impl", - "@lib//:winp", + "//libraries/winp", "//platform/statistics", "//platform/analysis-impl", "//platform/core-ui", diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml index 25627ff9f316..d9c6cc7982c8 100644 --- a/plugins/terminal/intellij.terminal.iml +++ b/plugins/terminal/intellij.terminal.iml @@ -52,7 +52,7 @@ - + diff --git a/plugins/ui-designer/BUILD.bazel b/plugins/ui-designer/BUILD.bazel index 13c7f9a66fb6..dd0546e281f7 100644 --- a/plugins/ui-designer/BUILD.bazel +++ b/plugins/ui-designer/BUILD.bazel @@ -53,7 +53,7 @@ jvm_library( "//java/compiler/impl", "//platform/icons", "@lib//:jgoodies-forms", - "@lib//:asm", + "//libraries/asm", "//plugins/java-i18n", "//java/idea-ui:ui", "//java/java-impl:impl", @@ -122,7 +122,7 @@ jvm_library( "//java/compiler/impl", "//platform/icons", "@lib//:jgoodies-forms", - "@lib//:asm", + "//libraries/asm", "//plugins/java-i18n", "//plugins/java-i18n:java-i18n_test_lib", "//java/idea-ui:ui", diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.iml b/plugins/ui-designer/intellij.java.guiForms.designer.iml index ba9164edec92..fd346e7c031b 100644 --- a/plugins/ui-designer/intellij.java.guiForms.designer.iml +++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml @@ -41,7 +41,7 @@ - + diff --git a/plugins/ui-designer/jps-plugin/BUILD.bazel b/plugins/ui-designer/jps-plugin/BUILD.bazel index 420f458c66e2..45008c979f4a 100644 --- a/plugins/ui-designer/jps-plugin/BUILD.bazel +++ b/plugins/ui-designer/jps-plugin/BUILD.bazel @@ -23,7 +23,7 @@ jvm_library( "//java/compiler/instrumentation-util", "//java/compiler/forms-compiler:java-guiForms-compiler", "//platform/forms_rt:java-guiForms-rt", - "@lib//:asm", + "//libraries/asm", "//platform/util/jdom", ] ) diff --git a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml index 68144ba26144..3b7601825fb5 100644 --- a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml +++ b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/plugins/ui-designer/jps-plugin/tests/BUILD.bazel b/plugins/ui-designer/jps-plugin/tests/BUILD.bazel index 76201545aae2..e680dcb65268 100644 --- a/plugins/ui-designer/jps-plugin/tests/BUILD.bazel +++ b/plugins/ui-designer/jps-plugin/tests/BUILD.bazel @@ -16,7 +16,7 @@ jvm_library( "//jps/jps-builders:build-tests_test_lib", "//jps/model-api:model", "//plugins/ui-designer/jps-plugin:java-guiForms-jps", - "@lib//:asm", + "//libraries/asm", "//platform/forms_rt:java-guiForms-rt", "//jps/jps-builders:build", "//platform/testFramework", diff --git a/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml b/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml index dce836a16735..591303513339 100644 --- a/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml +++ b/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml @@ -10,7 +10,7 @@ - + diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 197835dae07b..e9c093e7f5cf 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -263,7 +263,7 @@ jvm_library( "//platform/indexing-impl", "//python:python-pydev", "//platform/observable", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//platform/xdebugger-api:debugger", "//RegExpSupport:regexp", "//platform/editor-ui-ex:editor-ex", @@ -278,7 +278,7 @@ jvm_library( "//libraries/kotlin-reflect", "//libraries/gson", "//platform/vcs-api:vcs", - "@lib//:x_stream", + "//libraries/xstream", "@lib//:libthrift", "@lib//:slf4j-api", "@lib//:slf4j-jdk14", @@ -483,7 +483,7 @@ jvm_library( "@lib//:objenesis", "//platform/lang-impl:lang-tests_test_lib", "//platform/platform-impl/internal", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//platform/testFramework/extensions:testExtensions", "@lib//:hamcrest", "//platform/platform-tests:tests_test_lib", @@ -622,12 +622,12 @@ jvm_library( deps = [ "//platform/core-api:core", "//platform/xdebugger-api:debugger", - "@lib//:xml_r_p_c", + "//libraries/xml-rpc", "//libraries/guava", "//platform/editor-ui-api:editor-ui", "//platform/util", "@lib//:kotlin-stdlib", - "@lib//:x_stream", + "//libraries/xstream", "//platform/util:util-ui", "//python/python-psi-api:psi", "//platform/util/concurrency", diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 5fbd7b57afed..3fa20d677286 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -59,7 +59,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml index 71722033614a..8c097bfb1725 100644 --- a/python/intellij.python.community.tests.iml +++ b/python/intellij.python.community.tests.iml @@ -44,7 +44,7 @@ - + diff --git a/python/intellij.python.pydev.iml b/python/intellij.python.pydev.iml index 485edc253d44..962969d52929 100644 --- a/python/intellij.python.pydev.iml +++ b/python/intellij.python.pydev.iml @@ -10,12 +10,12 @@ - + - +