IJ-MR-175479 IJ-CR-146078 IJPL-209476 miglayout-swing, mvstore, proxy-vole, rhino, winp

GitOrigin-RevId: 18f6ef6f31cc80b26bca98a7ab025e2ade284102
This commit is contained in:
Vladimir Krivosheev
2025-10-04 20:39:14 +02:00
committed by intellij-monorepo-bot
parent 026e9d1fab
commit 0272d6a0c7
184 changed files with 444 additions and 220 deletions

12
.idea/modules.xml generated
View File

@@ -627,6 +627,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/aalto-xml/intellij.libraries.aalto.xml.iml" filepath="$PROJECT_DIR$/libraries/aalto-xml/intellij.libraries.aalto.xml.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml" filepath="$PROJECT_DIR$/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/asm/intellij.libraries.asm.iml" filepath="$PROJECT_DIR$/libraries/asm/intellij.libraries.asm.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" filepath="$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/caffeine/intellij.libraries.caffeine.iml" filepath="$PROJECT_DIR$/libraries/caffeine/intellij.libraries.caffeine.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" filepath="$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" />
@@ -654,29 +655,34 @@
<module fileurl="file://$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" filepath="$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/junit5-params/intellij.libraries.junit5.params.iml" filepath="$PROJECT_DIR$/libraries/junit5-params/intellij.libraries.junit5.params.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/junit5-pioneer/intellij.libraries.junit5.pioneer.iml" filepath="$PROJECT_DIR$/libraries/junit5-pioneer/intellij.libraries.junit5.pioneer.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-reflect/intellij.libraries.kotlin.reflect.iml" filepath="$PROJECT_DIR$/libraries/kotlin-reflect/intellij.libraries.kotlin.reflect.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" filepath="$PROJECT_DIR$/libraries/kotlin-test/intellij.libraries.kotlinTest.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-test-assertions-core-jvm/intellij.libraries.kotlinTestAssertionsCoreJvm.iml" filepath="$PROJECT_DIR$/libraries/kotlin-test-assertions-core-jvm/intellij.libraries.kotlinTestAssertionsCoreJvm.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlin-reflect/intellij.libraries.kotlin.reflect.iml" filepath="$PROJECT_DIR$/libraries/kotlin-reflect/intellij.libraries.kotlin.reflect.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlinx/coroutines/slf4j/intellij.libraries.kotlinx.coroutines.slf4j.iml" filepath="$PROJECT_DIR$/libraries/kotlinx/coroutines/slf4j/intellij.libraries.kotlinx.coroutines.slf4j.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/io/intellij.libraries.kotlinx.io.iml" filepath="$PROJECT_DIR$/libraries/io/intellij.libraries.kotlinx.io.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml" filepath="$PROJECT_DIR$/libraries/kotlinx/serialization/core/intellij.libraries.kotlinx.serialization.core.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml" filepath="$PROJECT_DIR$/libraries/kotlinx/serialization/json/intellij.libraries.kotlinx.serialization.json.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/lz4/intellij.libraries.lz4.iml" filepath="$PROJECT_DIR$/libraries/lz4/intellij.libraries.lz4.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor/client/intellij.libraries.ktor.client.iml" filepath="$PROJECT_DIR$/libraries/ktor/client/intellij.libraries.ktor.client.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml" filepath="$PROJECT_DIR$/libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor/io/intellij.libraries.ktor.io.iml" filepath="$PROJECT_DIR$/libraries/ktor/io/intellij.libraries.ktor.io.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml" filepath="$PROJECT_DIR$/libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/ktor/utils/intellij.libraries.ktor.utils.iml" filepath="$PROJECT_DIR$/libraries/ktor/utils/intellij.libraries.ktor.utils.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" filepath="$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/lz4/intellij.libraries.lz4.iml" filepath="$PROJECT_DIR$/libraries/lz4/intellij.libraries.lz4.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" filepath="$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml" filepath="$PROJECT_DIR$/libraries/miglayout-swing/intellij.libraries.miglayout.swing.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" filepath="$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/mvstore/intellij.libraries.mvstore.iml" filepath="$PROJECT_DIR$/libraries/mvstore/intellij.libraries.mvstore.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/proxy-vole/intellij.libraries.proxy.vole.iml" filepath="$PROJECT_DIR$/libraries/proxy-vole/intellij.libraries.proxy.vole.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/rhino/intellij.libraries.rhino.iml" filepath="$PROJECT_DIR$/libraries/rhino/intellij.libraries.rhino.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" filepath="$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/sshd-osgi/intellij.libraries.sshd.osgi.iml" filepath="$PROJECT_DIR$/libraries/sshd-osgi/intellij.libraries.sshd.osgi.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml" filepath="$PROJECT_DIR$/libraries/system-stubs-jupiter/intellij.libraries.system.stubs.jupiter.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" filepath="$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" filepath="$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" filepath="$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/winp/intellij.libraries.winp.iml" filepath="$PROJECT_DIR$/libraries/winp/intellij.libraries.winp.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" filepath="$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" filepath="$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" />

View File

@@ -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

View File

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

View File

@@ -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",

View File

@@ -10,7 +10,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.java.guiForms.rt" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="jgoodies-forms" level="project" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />

View File

@@ -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",

View File

@@ -54,7 +54,7 @@
<orderEntry type="module" module-name="intellij.platform.tracing.rt" />
<orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
<orderEntry type="library" name="OroMatcher" level="project" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="library" name="protobuf" level="project" />
<orderEntry type="library" name="netty-codec-http" level="project" />
@@ -62,7 +62,7 @@
<orderEntry type="library" name="fastutil-min" level="project" />
<orderEntry type="library" name="jps-javac-extension" level="project" />
<orderEntry type="library" name="netty-buffer" level="project" />
<orderEntry type="library" name="winp" level="project" />
<orderEntry type="module" module-name="intellij.libraries.winp" />
<orderEntry type="module" module-name="intellij.libraries.jackson" />
<orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />

View File

@@ -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

View File

@@ -7,6 +7,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
</component>
</module>

View File

@@ -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"]

View File

@@ -10,7 +10,7 @@
<orderEntry type="library" scope="PROVIDED" name="Ant" level="project" />
<orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
<orderEntry type="module" module-name="intellij.java.guiForms.rt" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil.java8" scope="RUNTIME" />
</component>

View File

@@ -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",

View File

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

View File

@@ -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",

View File

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

View File

@@ -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",
]

View File

@@ -57,7 +57,7 @@
<orderEntry type="module" module-name="intellij.java.syntax" />
<orderEntry type="library" name="slf4j-api" level="project" />
<orderEntry type="module" module-name="intellij.xml.psi" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.libraries.jackson" />
<orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
</component>

View File

@@ -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",

View File

@@ -42,7 +42,7 @@
<orderEntry type="module" module-name="intellij.xml.psi" />
<orderEntry type="module" module-name="intellij.xml.psi.impl" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.java" />

View File

@@ -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",

View File

@@ -34,7 +34,7 @@
<orderEntry type="module" module-name="intellij.java.frontback.psi" exported="" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" name="fastutil-min" level="project" />

View File

@@ -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",

View File

@@ -20,7 +20,7 @@
<orderEntry type="library" name="fastutil-min" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
<orderEntry type="module" module-name="intellij.java.compiler" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.java.impl.refactorings" />
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="module" module-name="intellij.platform.jps.model" />

View File

@@ -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",

View File

@@ -28,7 +28,7 @@
<orderEntry type="module" module-name="intellij.java.frontback.psi.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="fastutil-min" level="project" />

View File

@@ -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",

View File

@@ -113,7 +113,7 @@
<orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.navbar.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.unscramble" scope="TEST" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" scope="TEST" />
<orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.todo" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.statistics.testFramework" scope="TEST" />

View File

@@ -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",
]

View File

@@ -30,7 +30,7 @@
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
</component>

View File

@@ -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",

View File

@@ -46,7 +46,7 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="org.codehaus.groovy:groovy" level="project" />
<orderEntry type="module" module-name="intellij.java.impl.refactorings" />
<orderEntry type="module" module-name="intellij.platform.debugger.impl" />

View File

@@ -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",
]

View File

@@ -31,7 +31,7 @@
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil.java8" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
<orderEntry type="library" name="jgoodies-forms" level="project" />
@@ -70,7 +70,7 @@
<orderEntry type="library" scope="PROVIDED" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.libraries.hash4j" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="library" name="mvstore" level="project" />
<orderEntry type="module" module-name="intellij.libraries.mvstore" />
<orderEntry type="library" scope="PROVIDED" name="netty-jps" level="project" />
<orderEntry type="library" exported="" name="maven-resolver-provider" level="project" />
<orderEntry type="library" exported="" name="http-client" level="project" />

View File

@@ -22,7 +22,7 @@
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" scope="TEST" />
<orderEntry type="library" scope="TEST" name="Eclipse" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
<orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
<orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
@@ -78,7 +78,7 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="mvstore" level="project" />
<orderEntry type="module" module-name="intellij.libraries.mvstore" scope="TEST" />
<orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
<orderEntry type="module" module-name="intellij.platform.jps.model.testFramework" scope="TEST" />
</component>

View File

@@ -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`

18
libraries/asm/BUILD.bazel Normal file
View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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",

View File

@@ -163,7 +163,7 @@
<orderEntry type="library" name="tcServiceMessages" level="project" />
<orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" scope="RUNTIME" />
<orderEntry type="library" name="jsoup" level="project" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="module-library">
<library name="spdx.tools.java" type="repository">
<properties maven-id="org.spdx:tools-java:1.1.8">

View File

@@ -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<Pair<String, (String, FrontendModuleFilter) -> 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<Pair<String, (String, FrontendModuleFi
PRODUCT_BACKEND_JAR to { name, filter -> (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" },

View File

@@ -19,6 +19,7 @@ fun JpsModule.isLibraryModule(): Boolean {
*/
private val LIBRARY_MODULE_NAMES: Set<String> = 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<String> = 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",

View File

@@ -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")
}
}

View File

@@ -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",

View File

@@ -27,7 +27,7 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.editor.ex" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.platform.diff" />
<orderEntry type="library" name="fastutil-min" level="project" />

View File

@@ -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",

View File

@@ -31,7 +31,7 @@
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />

View File

@@ -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",

View File

@@ -50,7 +50,7 @@
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.macro" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.libraries.guava" />
<orderEntry type="module" module-name="intellij.platform.refactoring" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />

View File

@@ -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",

View File

@@ -67,8 +67,8 @@
<orderEntry type="library" name="commons-logging" level="project" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" />
<orderEntry type="module" module-name="intellij.platform.builtInServer" />
<orderEntry type="library" name="XStream" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.xstream" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="module" module-name="intellij.libraries.lz4" />

View File

@@ -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",

View File

@@ -43,10 +43,10 @@
<orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="library" name="winp" level="project" />
<orderEntry type="module" module-name="intellij.libraries.winp" />
<orderEntry type="library" name="swingx" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="module" module-name="intellij.platform.lang.core" />
<orderEntry type="module" module-name="intellij.platform.lvcs" />
@@ -85,7 +85,7 @@
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" name="jcef" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
<orderEntry type="library" name="jsoup" level="project" />
<orderEntry type="module" module-name="intellij.platform.rd.community" />
<orderEntry type="library" name="fastutil-min" level="project" />

View File

@@ -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",

View File

@@ -58,7 +58,7 @@
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="module" module-name="intellij.libraries.guava" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
<orderEntry type="library" name="fastutil-min" level="project" />
<orderEntry type="module" module-name="intellij.libraries.hash4j" />

View File

@@ -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",

View File

@@ -17,7 +17,7 @@
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.libraries.guava" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.editor.ex" />

View File

@@ -7,6 +7,7 @@
<module name="intellij.libraries.kotlinx.serialization.json" loading="embedded"/>
<module name="intellij.libraries.aalto.xml" loading="embedded"/>
<module name="intellij.libraries.asm" loading="embedded"/>
<module name="intellij.libraries.caffeine" loading="embedded"/>
<module name="intellij.libraries.gson" loading="embedded"/>
<module name="intellij.libraries.guava" loading="embedded"/>
@@ -20,8 +21,23 @@
<module name="intellij.libraries.jackson.databind" loading="embedded"/>
<module name="intellij.libraries.jackson.module.kotlin" loading="embedded"/>
<module name="intellij.libraries.kotlin.reflect" loading="embedded"/>
<!--Space plugin uses it and bundles into IntelliJ IDEA, but not bundles into DataGrip, so, or Space plugin should bundle this lib,-->
<!--or IJ Platform. As it is a small library and consistency is important across other coroutine libs, bundle to IJ Platform.-->
<module name="intellij.libraries.kotlinx.coroutines.slf4j" loading="embedded"/>
<module name="intellij.libraries.lz4" loading="embedded"/>
<module name="intellij.libraries.miglayout.swing" loading="embedded"/>
<module name="intellij.libraries.mvstore" loading="embedded"/>
<module name="intellij.libraries.proxy.vole" loading="embedded"/>
<module name="intellij.libraries.rhino" loading="embedded"/>
<module name="intellij.libraries.winp" loading="embedded"/>
<module name="intellij.libraries.xz" loading="embedded"/>
</content>
</idea-plugin>

View File

@@ -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",

View File

@@ -66,7 +66,7 @@
<orderEntry type="library" scope="TEST" name="assertj-swing" level="project" />
<orderEntry type="library" scope="TEST" name="snakeyaml" level="project" />
<orderEntry type="library" scope="TEST" name="jna" level="project" />
<orderEntry type="library" scope="TEST" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.serviceContainer" scope="TEST" />
@@ -130,7 +130,7 @@
<orderEntry type="library" scope="TEST" name="ktor-server-cio" level="project" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.io" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.ui.jcef" scope="TEST" />
<orderEntry type="library" scope="TEST" name="rhino" level="project" />
<orderEntry type="module" module-name="intellij.libraries.rhino" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.eel.impl" />
<orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
<orderEntry type="module" module-name="intellij.platform.eelHelper" scope="TEST" />

View File

@@ -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

View File

@@ -12,10 +12,10 @@
<orderEntry type="module" module-name="intellij.platform.util.base" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" exported="" />
<orderEntry type="library" name="pty4j" level="project" />
<orderEntry type="library" name="winp" level="project" />
<orderEntry type="module" module-name="intellij.libraries.winp" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" name="proxy-vole" level="project" />
<orderEntry type="library" scope="RUNTIME" name="rhino" level="project" />
<orderEntry type="module" module-name="intellij.libraries.proxy.vole" />
<orderEntry type="module" module-name="intellij.libraries.rhino" scope="RUNTIME" />
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="module" module-name="intellij.libraries.jackson" />
</component>

View File

@@ -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",

View File

@@ -46,7 +46,7 @@
<orderEntry type="library" name="download-pgp-verifier" level="project" />
<orderEntry type="library" name="bouncy-castle-pgp" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.libraries.jackson" />
<orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
<orderEntry type="module" module-name="intellij.platform.rd.community" />

View File

@@ -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",

View File

@@ -46,7 +46,7 @@
<orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
<orderEntry type="library" name="opentelemetry" level="project" />
<orderEntry type="library" name="opentelemetry-semconv" level="project" />
<orderEntry type="library" name="mvstore" level="project" />
<orderEntry type="module" module-name="intellij.libraries.mvstore" />
<orderEntry type="module" module-name="intellij.libraries.jackson" />
<orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />

View File

@@ -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

View File

@@ -12,6 +12,6 @@
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.jps.model" />
<orderEntry type="module" module-name="intellij.platform.testFramework" />
<orderEntry type="library" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" />
</component>
</module>

View File

@@ -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

View File

@@ -21,6 +21,6 @@
<orderEntry type="module" module-name="intellij.libraries.lz4" />
<orderEntry type="module" module-name="intellij.platform.diagnostic" />
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
<orderEntry type="library" name="mvstore" level="project" />
<orderEntry type="module" module-name="intellij.libraries.mvstore" />
</component>
</module>

View File

@@ -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

View File

@@ -51,6 +51,6 @@
<orderEntry type="module" module-name="intellij.platform.diagnostic" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
<orderEntry type="library" name="kotlinx-serialization-protobuf" level="project" />
<orderEntry type="library" name="mvstore" level="project" />
<orderEntry type="module" module-name="intellij.libraries.mvstore" />
</component>
</module>

View File

@@ -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",

View File

@@ -61,7 +61,7 @@
<orderEntry type="module" module-name="intellij.platform.refactoring" />
<orderEntry type="module" module-name="intellij.platform.vcs.log" />
<orderEntry type="library" name="swingx" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.platform.util" />

View File

@@ -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",

View File

@@ -36,7 +36,7 @@
<orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="library" name="fastutil-min" level="project" />

View File

@@ -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",

View File

@@ -40,7 +40,7 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />

View File

@@ -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",

View File

@@ -62,7 +62,7 @@
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
<orderEntry type="module" module-name="intellij.platform.util.text.matching" />
<orderEntry type="module" module-name="intellij.platform.util.coroutines" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />

View File

@@ -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",

View File

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

View File

@@ -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",

View File

@@ -25,7 +25,7 @@
<orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" scope="TEST" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="TEST" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.libraries.asm" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.langInjection.backend" scope="TEST" />
<orderEntry type="module" module-name="intellij.markdown.plugin.main" scope="TEST" />

View File

@@ -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",

Some files were not shown because too many files have changed in this diff Show More