diff --git a/.idea/modules.xml b/.idea/modules.xml index 4cc0b5eb176a..e2dcdc67d3dd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -915,6 +915,7 @@ + @@ -922,6 +923,7 @@ + diff --git a/aether-dependency-resolver/BUILD.bazel b/aether-dependency-resolver/BUILD.bazel index 1703cf402fa8..b32c7a745148 100644 --- a/aether-dependency-resolver/BUILD.bazel +++ b/aether-dependency-resolver/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.java.aetherDependencyResolver` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "aether-dependency-resolver_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "aether-dependency-resolver", module_name = "intellij.java.aetherDependencyResolver", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":aether-dependency-resolver_resources"], kotlinc_opts = "@community//:k11", deps = [ "@lib//:jetbrains-annotations", @@ -13,7 +20,7 @@ jvm_library( "//libraries/commons/logging", "@lib//:slf4j-api", "@lib//:slf4j-jdk14", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-transport-file", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-transport-http", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-connector-basic", @@ -38,7 +45,7 @@ jvm_library( "@lib//:slf4j-jdk14", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-transport-file", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-transport-http", "@lib//:java-aether_dependency_resolver-org-apache-maven-resolver-maven-resolver-connector-basic", diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml index 8c309bd814bb..c915bd770d0a 100644 --- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml +++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + diff --git a/aether-dependency-resolver/module-content.yaml b/aether-dependency-resolver/module-content.yaml new file mode 100644 index 000000000000..03b245efee61 --- /dev/null +++ b/aether-dependency-resolver/module-content.yaml @@ -0,0 +1,10 @@ +- name: dist.all/lib/intellij.java.aetherDependencyResolver.jar + modules: + - name: intellij.java.aetherDependencyResolver + libraries: + org.apache.maven.resolver:maven-resolver-transport-file: + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1/maven-resolver-transport-file-1.jar + org.apache.maven.resolver:maven-resolver-transport-http: + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1/maven-resolver-transport-http-1.jar + org.apache.maven.resolver:maven-resolver-connector-basic: + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1/maven-resolver-connector-basic-1.jar \ No newline at end of file diff --git a/aether-dependency-resolver/resources/intellij.java.aetherDependencyResolver.xml b/aether-dependency-resolver/resources/intellij.java.aetherDependencyResolver.xml new file mode 100644 index 000000000000..c38dabce1dbe --- /dev/null +++ b/aether-dependency-resolver/resources/intellij.java.aetherDependencyResolver.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/build/BUILD.bazel b/build/BUILD.bazel index 0880497ae3fa..d905bb44aa91 100644 --- a/build/BUILD.bazel +++ b/build/BUILD.bazel @@ -75,7 +75,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "//platform/build-scripts/downloader", "@community//build:zip", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", ], exports = ["//platform/build-scripts"], runtime_deps = ["@lib//:test-discovery-plugin-base"] diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 1c10c5158ab9..794aa22cb5a7 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -329,7 +329,6 @@ java/remote-servers/api java/remote-servers/impl java/structuralsearch-java java/testFramework -java/testFramework/backend java/testFramework/shared java/typeMigration java/unscramble @@ -440,7 +439,6 @@ libraries/kotlinx/coroutines/test libraries/kotlinx/datetime libraries/kotlinx/document-store-mvstore libraries/kotlinx/html -libraries/kotlinx/serialization/cbor libraries/kotlinx/serialization/core libraries/kotlinx/serialization/json libraries/kotlinx/serialization/protobuf @@ -453,6 +451,7 @@ libraries/ktor/utils libraries/lucene.common libraries/lz4 libraries/markdown +libraries/maven-resolver-provider libraries/microba libraries/miglayout-swing libraries/mockito @@ -460,6 +459,7 @@ libraries/mvstore libraries/opencsv libraries/oro-matcher libraries/plexus-utils +libraries/protobuf libraries/proxy-vole libraries/pty4j libraries/rd/core diff --git a/build/intellij.idea.community.build.iml b/build/intellij.idea.community.build.iml index 3eb5d3f55e99..b19a26ee77a2 100644 --- a/build/intellij.idea.community.build.iml +++ b/build/intellij.idea.community.build.iml @@ -33,6 +33,6 @@ - + \ No newline at end of file diff --git a/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml b/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml index 4f474099d986..e7b76ac6986e 100644 --- a/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml +++ b/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt index 007b60c0b977..c64e9d04bb81 100644 --- a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt +++ b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt @@ -50,6 +50,9 @@ suspend fun buildCommunityStandaloneJpsBuilder( "intellij.libraries.asm", "intellij.libraries.jgoodies.forms", "intellij.libraries.oro.matcher", + "intellij.libraries.plexus.utils", + "intellij.libraries.protobuf", + "intellij.libraries.maven.resolver.provider", ).map { ModuleItem(moduleName = it, relativeOutputFile = "util.jar", reason = null) }) layout.withModule("intellij.platform.util.rt", "util_rt.jar") @@ -96,7 +99,6 @@ suspend fun buildCommunityStandaloneJpsBuilder( for (it in listOf( "jna", - "protobuf", "Log4J", "Eclipse", "netty-jps", @@ -105,7 +107,6 @@ suspend fun buildCommunityStandaloneJpsBuilder( "jps-javac-extension", "kotlin-stdlib", "kotlinx-coroutines-core", - "maven-resolver-provider", "kotlin-metadata", )) { layout.withProjectLibrary(it, LibraryPackMode.STANDALONE_MERGED) diff --git a/grid/images/resources/intellij.grid.images.impl.xml b/grid/images/resources/intellij.grid.images.impl.xml index fbc10c1e4c32..6ad193e3daac 100644 --- a/grid/images/resources/intellij.grid.images.impl.xml +++ b/grid/images/resources/intellij.grid.images.impl.xml @@ -3,7 +3,6 @@ - diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index b97c1f5a4ed2..69fa8293cf87 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -56,7 +56,7 @@ jvm_library( "//libraries/oro-matcher", "//libraries/asm", "@lib//:kotlin-stdlib", - "@lib//:protobuf", + "//libraries/protobuf", "@lib//:netty-codec-http", "//libraries/stream", "//libraries/fastutil", diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index 05e3cc43df2f..9dc0c38729b0 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -56,7 +56,7 @@ - + diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index 5ad84cd71aeb..6034f7e23c9f 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -59,7 +59,7 @@ jvm_library( "//platform/backend/observation", "//platform/eel-provider", "//platform/util/concurrency", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//java/java-syntax:syntax", "@lib//:slf4j-api", "//xml/xml-psi-api:psi", diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml index b4641d27dbde..40e1770a42b9 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -54,7 +54,7 @@ - + diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml new file mode 100644 index 000000000000..721b37e1b17f --- /dev/null +++ b/java/idea-ui/resources/intellij.java.ui.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index 9d7cd5e3f5ef..987a271bd79e 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -154,7 +154,7 @@ jvm_library( "//platform/testFramework/junit5/projectStructure", "//platform/testFramework/junit5/projectStructure:projectStructure_test_lib", "//platform/syntax/syntax-psi:psi", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//java/java-syntax:syntax", "//platform/lang-impl", "//xml/impl", diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index c6d55c06b596..9def6c42b1e6 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -124,7 +124,7 @@ - + diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml index 0670cd363234..4ea398b3e086 100644 --- a/java/plugin/plugin-content.yaml +++ b/java/plugin/plugin-content.yaml @@ -1,6 +1,3 @@ -- name: lib/aether-dependency-resolver.jar - modules: - - name: intellij.java.aetherDependencyResolver - name: lib/completion-ranking-java.jar library: completion-ranking-java module: intellij.java.impl @@ -49,7 +46,6 @@ - name: intellij.java.debugger.impl - name: intellij.java.debugger.memory.agent - name: intellij.java.execution.impl - - name: intellij.java.ui - name: intellij.java.structureView - name: intellij.java.manifest - name: intellij.java.remoteServers.impl @@ -73,6 +69,7 @@ - name: intellij.java.resources.en reason: <- intellij.java.plugin contentModules: + - name: intellij.java.ui - name: intellij.java.performancePlugin - name: intellij.java.terminal - name: intellij.java.debugger.impl.backend @@ -111,21 +108,6 @@ files: - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-metadata-jvm/2/kotlin-metadata-jvm-2.jar reason: withProjectLibrary -- name: lib/maven-resolver-connector-basic.jar - library: org.apache.maven.resolver:maven-resolver-connector-basic - module: intellij.java.aetherDependencyResolver - files: - - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1/maven-resolver-connector-basic-1.jar -- name: lib/maven-resolver-transport-file.jar - library: org.apache.maven.resolver:maven-resolver-transport-file - module: intellij.java.aetherDependencyResolver - files: - - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1/maven-resolver-transport-file-1.jar -- name: lib/maven-resolver-transport-http.jar - library: org.apache.maven.resolver:maven-resolver-transport-http - module: intellij.java.aetherDependencyResolver - files: - - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1/maven-resolver-transport-http-1.jar - name: lib/modules/intellij.java.debugger.impl.frontend.jar contentModules: - name: intellij.java.debugger.impl.frontend diff --git a/java/plugin/resources/META-INF/plugin.xml b/java/plugin/resources/META-INF/plugin.xml index a9e4b41fe11d..0bb50f21c20d 100644 --- a/java/plugin/resources/META-INF/plugin.xml +++ b/java/plugin/resources/META-INF/plugin.xml @@ -26,6 +26,8 @@ + + diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index 95b194d43047..4bd43ec9cc78 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( "//platform/util/jdom", "//platform/util/nanoxml", "//libraries/jgoodies/forms", - "@lib//:protobuf", + "//libraries/protobuf", "//jps/model-api:model", "//jps/model-serialization", "//jps/model-impl", @@ -43,13 +43,12 @@ jvm_library( "@lib//:jetbrains-annotations", "//libraries/mvstore", "//libraries/http-client", + "//libraries/maven-resolver-provider", "@lib//:netty-jps-provided", - "@lib//:maven-resolver-provider", "@lib//:kotlin-metadata", "//libraries/kotlinx/coroutines/core", "//platform/eel", ], - exports = ["@lib//:maven-resolver-provider"], runtime_deps = [ "//java/compiler/instrumentation-util-8:java-compiler-instrumentationUtil-java8", "//java/java-runtime:rt", diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index 0ca526a1ef99..b05322d8b505 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -35,7 +35,7 @@ - + @@ -72,8 +72,8 @@ + - diff --git a/jps/standalone-builder/BUILD.bazel b/jps/standalone-builder/BUILD.bazel index 5841b13683c4..878d46b03848 100644 --- a/jps/standalone-builder/BUILD.bazel +++ b/jps/standalone-builder/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( "//libraries/cli-parser", "//jps/model-serialization", "@community//build:build-javac-rt", - "@lib//:protobuf", + "//libraries/protobuf", ] ) ### auto-generated section `build intellij.tools.jps.build.standalone` end \ No newline at end of file diff --git a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml index 7073a1d4a3bd..97bcbf13eb66 100644 --- a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml +++ b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml @@ -30,6 +30,6 @@ - + \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 9fce9af593aa..8b27df125dbe 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -420,6 +420,34 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "asm-tools", + exports = [ + ":org_ow2_asm-asm-analysis-9_8_http_import", + ":org_ow2_asm-asm-tree-9_8_http_import", + ":org_ow2_asm-asm-9_8_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "org_ow2_asm-asm-analysis-9_8_http_import", + jar = "@org_ow2_asm-asm-analysis-9_8_http//file", + source_jar = "@org_ow2_asm-asm-analysis-9_8-sources_http//file" +) + +jvm_import( + name = "org_ow2_asm-asm-tree-9_8_http_import", + jar = "@org_ow2_asm-asm-tree-9_8_http//file", + source_jar = "@org_ow2_asm-asm-tree-9_8-sources_http//file" +) + +jvm_import( + name = "org_ow2_asm-asm-9_8_http_import", + jar = "@org_ow2_asm-asm-9_8_http//file", + source_jar = "@org_ow2_asm-asm-9_8-sources_http//file" +) + jvm_import( name = "assert_j", jar = "@org_assertj-assertj-core-4_0_0-M1_http//file", @@ -434,6 +462,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "automaton", + jar = "@dk_brics-automaton-1_12-4_http//file", + source_jar = "@dk_brics-automaton-1_12-4-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "bouncy-castle-pgp", jar = "@org_bouncycastle-bcpg-jdk18on-1_81_http//file", @@ -560,6 +595,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "commons-imaging", + jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1_http//file", + source_jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "commons-io", jar = "@commons-io-commons-io-2_18_0_http//file", @@ -574,6 +616,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "commons-logging", + jar = "@commons-logging-commons-logging-1_2_http//file", + source_jar = "@commons-logging-commons-logging-1_2-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "completion_ml_ranking_models-completion-ranking-cpp-exp", jar = "@org_jetbrains_intellij_deps_completion-completion-ranking-cpp-0_1_5_http//file", @@ -2529,6 +2578,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "imgscalr", + jar = "@org_imgscalr-imgscalr-lib-4_2_http//file", + source_jar = "@org_imgscalr-imgscalr-lib-4_2-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "intellij-plugin-structure", exports = [ @@ -2767,6 +2823,13 @@ jvm_import( source_jar = "@io_qameta_allure-allure-model-2_25_0-sources_http//file" ) +jvm_import( + name = "ion", + jar = "@com_amazon_ion-ion-java-1_11_10_http//file", + source_jar = "@com_amazon_ion-ion-java-1_11_10-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "jackson", jar = "@com_fasterxml_jackson_core-jackson-core-2_19_0_http//file", @@ -3093,6 +3156,13 @@ jvm_import( source_jar = "@com_sun_activation-jakarta_activation-1_2_2-sources_http//file" ) +jvm_import( + name = "jaxen", + jar = "@jaxen-jaxen-1_2_0_http//file", + source_jar = "@jaxen-jaxen-1_2_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "jb-jdi", jar = "@org_jetbrains_intellij_deps-jb-jdi-2_45_http//file", @@ -3107,6 +3177,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "jcip", + jar = "@net_jcip-jcip-annotations-1_0_http//file", + source_jar = "@net_jcip-jcip-annotations-1_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "jediterm-core", jar = "@org_jetbrains_jediterm-jediterm-core-3_57_http//file", @@ -3727,6 +3804,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "jzlib", + jar = "@com_jcraft-jzlib-1_1_3_http//file", + source_jar = "@com_jcraft-jzlib-1_1_3-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "kaml", exports = [ @@ -4379,6 +4463,27 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "kotlinx-document-store-mvstore", + exports = [ + ":com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", + ":com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", + jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http//file", + source_jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4-sources_http//file" +) + +jvm_import( + name = "com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", + jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http//file", + source_jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4-sources_http//file" +) + java_library( name = "kotlinx-io-core", exports = [ @@ -4400,6 +4505,13 @@ jvm_import( source_jar = "@org_jetbrains_kotlinx-kotlinx-io-bytestring-jvm-0_7_0-sources_http//file" ) +jvm_import( + name = "kotlinx-serialization-cbor", + jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0_http//file", + source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "kotlinx-serialization-core", jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_9_0_http//file", @@ -4422,6 +4534,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "kotlinx-serialization-protobuf", + jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0_http//file", + source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "ktor-client-cio", exports = [ @@ -4747,41 +4866,6 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( - name = "libraries-asm-tools-asm-tools", - exports = [ - ":org_ow2_asm-asm-analysis-9_8_http_import", - ":org_ow2_asm-asm-tree-9_8_http_import", - ":org_ow2_asm-asm-9_8_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "org_ow2_asm-asm-analysis-9_8_http_import", - jar = "@org_ow2_asm-asm-analysis-9_8_http//file", - source_jar = "@org_ow2_asm-asm-analysis-9_8-sources_http//file" -) - -jvm_import( - name = "org_ow2_asm-asm-tree-9_8_http_import", - jar = "@org_ow2_asm-asm-tree-9_8_http//file", - source_jar = "@org_ow2_asm-asm-tree-9_8-sources_http//file" -) - -jvm_import( - name = "org_ow2_asm-asm-9_8_http_import", - jar = "@org_ow2_asm-asm-9_8_http//file", - source_jar = "@org_ow2_asm-asm-9_8-sources_http//file" -) - -jvm_import( - name = "libraries-automaton-automaton", - jar = "@dk_brics-automaton-1_12-4_http//file", - source_jar = "@dk_brics-automaton-1_12-4-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-blockmap-blockmap", jar = "@org_jetbrains_intellij-blockmap-1_0_7_http//file", @@ -4887,20 +4971,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-commons-imaging-commons-imaging", - jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1_http//file", - source_jar = "@org_jetbrains_intellij_deps-commons-imaging-1_0-RC-1-sources_http//file", - visibility = ["//visibility:public"] -) - -jvm_import( - name = "libraries-commons-logging-commons-logging", - jar = "@commons-logging-commons-logging-1_2_http//file", - source_jar = "@commons-logging-commons-logging-1_2-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-commons-text-commons-text", jar = "@org_apache_commons-commons-text-1_14_0_http//file", @@ -5330,13 +5400,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-imgscalr-imgscalr", - jar = "@org_imgscalr-imgscalr-lib-4_2_http//file", - source_jar = "@org_imgscalr-imgscalr-lib-4_2-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-ini4j-ini4j", jar = "@org_jetbrains_intellij_deps-ini4j-0_5_5-2_http//file", @@ -5344,13 +5407,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-ion-ion", - jar = "@com_amazon_ion-ion-java-1_11_10_http//file", - source_jar = "@com_amazon_ion-ion-java-1_11_10-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-jackson-jr-objects-jackson-jr-objects", jar = "@com_fasterxml_jackson_jr-jackson-jr-objects-2_19_0_http//file", @@ -5358,13 +5414,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-jaxen-_jaxen", - jar = "@jaxen-jaxen-1_2_0_http//file", - source_jar = "@jaxen-jaxen-1_2_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-jcef-jcef", jar = "@org_jetbrains_intellij_deps_jcef-jcef-137_0_17-gf354b0e-chromium-137_0_7151_104-api-1_20-261-b15_http//file", @@ -5372,13 +5421,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-jcip-jcip", - jar = "@net_jcip-jcip-annotations-1_0_http//file", - source_jar = "@net_jcip-jcip-annotations-1_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-jediterm-ui-jediterm-ui", jar = "@org_jetbrains_jediterm-jediterm-ui-3_57_http//file", @@ -5413,34 +5455,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-jzlib-jzlib", - jar = "@com_jcraft-jzlib-1_1_3_http//file", - source_jar = "@com_jcraft-jzlib-1_1_3-sources_http//file", - visibility = ["//visibility:public"] -) - -java_library( - name = "libraries-kotlinx-document-store-mvstore-kotlinx-document-store-mvstore", - exports = [ - ":com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", - ":com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http_import", - jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4_http//file", - source_jar = "@com_github_lamba92-kotlinx-document-store-mvstore-0_0_4-sources_http//file" -) - -jvm_import( - name = "com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http_import", - jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4_http//file", - source_jar = "@com_github_lamba92-kotlinx-document-store-core-jvm-0_0_4-sources_http//file" -) - jvm_import( name = "libraries-kotlinx-html-kotlinx-html-jvm", jar = "@org_jetbrains_kotlinx-kotlinx-html-jvm-0_12_0_http//file", @@ -5448,20 +5462,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-kotlinx-serialization-cbor-kotlinx-serialization-cbor", - jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0_http//file", - source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-cbor-jvm-1_9_0-sources_http//file", - visibility = ["//visibility:public"] -) - -jvm_import( - name = "libraries-kotlinx-serialization-protobuf-kotlinx-serialization-protobuf", - jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0_http//file", - source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-protobuf-jvm-1_9_0-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-kryo5-kryo", jar = "@com_esotericsoftware-kryo5-5_6_0_http//file", @@ -5526,13 +5526,6 @@ jvm_import( source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_9_0-sources_http//file" ) -jvm_import( - name = "libraries-lz4-lz4-java", - jar = "@org_lz4-lz4-java-1_8_0_http//file", - source_jar = "@org_lz4-lz4-java-1_8_0-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "libraries-miglayout-swing-miglayout-swing", exports = [ @@ -5582,13 +5575,6 @@ jvm_import( source_jar = "@commons-beanutils-commons-beanutils-1_10_0-sources_http//file" ) -jvm_import( - name = "libraries-oro-matcher-_oro_matcher", - jar = "@oro-oro-2_0_8_http//file", - source_jar = "@oro-oro-2_0_8-sources_http//file", - visibility = ["//visibility:public"] -) - jvm_import( name = "libraries-plexus-utils-plexus-utils", jar = "@org_codehaus_plexus-plexus-utils-3_5_1_http//file", @@ -5694,13 +5680,6 @@ jvm_import( visibility = ["//visibility:public"] ) -jvm_import( - name = "libraries-swingx-swingx", - jar = "@org_swinglabs-swingx-core-1_6_2-2_http//file", - source_jar = "@org_swinglabs-swingx-core-1_6_2-2-sources_http//file", - visibility = ["//visibility:public"] -) - java_library( name = "libraries-system-stubs-jupiter-uk-webcompere-system-stubs-jupiter", exports = [ @@ -5867,6 +5846,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "lz4-java", + jar = "@org_lz4-lz4-java-1_8_0_http//file", + source_jar = "@org_lz4-lz4-java-1_8_0-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "maven-artifact_resolver-common-org-apache-maven-maven-artifact-3-0-5", exports = [ @@ -8545,6 +8531,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "oro_matcher", + jar = "@oro-oro-2_0_8_http//file", + source_jar = "@oro-oro-2_0_8-sources_http//file", + visibility = ["//visibility:public"] +) + java_library( name = "package-search-api-client", exports = [ @@ -9754,6 +9747,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "swingx", + jar = "@org_swinglabs-swingx-core-1_6_2-2_http//file", + source_jar = "@org_swinglabs-swingx-core-1_6_2-2-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "tasks-core-commons-discovery", jar = "@commons-discovery-commons-discovery-0_4_http//file", diff --git a/libraries/ai.grazie.spell.gec.engine.local/BUILD.bazel b/libraries/ai.grazie.spell.gec.engine.local/BUILD.bazel index 9733f3c0c71f..4564baaa52b5 100644 --- a/libraries/ai.grazie.spell.gec.engine.local/BUILD.bazel +++ b/libraries/ai.grazie.spell.gec.engine.local/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "@lib//:libraries-ai-grazie-spell-gec-engine-local-ai-grazie-spell-hunspell-en", "@lib//:libraries-ai-grazie-spell-gec-engine-local-ai-grazie-nlp-detect", "@lib//:libraries-ai-grazie-spell-gec-engine-local-ai-grazie-model-swagger-annotations-jvm", + "//libraries/lucene.common", ] ) ### auto-generated section `build intellij.libraries.ai.grazie.spell.gec.engine.local` end \ No newline at end of file diff --git a/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml b/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml index 0ed40a0ce283..480a20e2e8dd 100644 --- a/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml +++ b/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml @@ -145,5 +145,6 @@ + \ No newline at end of file diff --git a/libraries/bouncy-castle-provider/resources/intellij.libraries.bouncy.castle.provider.xml b/libraries/bouncy-castle-provider/resources/intellij.libraries.bouncy.castle.provider.xml index 6fb76a66265d..f88619559144 100644 --- a/libraries/bouncy-castle-provider/resources/intellij.libraries.bouncy.castle.provider.xml +++ b/libraries/bouncy-castle-provider/resources/intellij.libraries.bouncy.castle.provider.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/caffeine/resources/intellij.libraries.caffeine.xml b/libraries/caffeine/resources/intellij.libraries.caffeine.xml index 164f46cfcfb2..970c87386739 100644 --- a/libraries/caffeine/resources/intellij.libraries.caffeine.xml +++ b/libraries/caffeine/resources/intellij.libraries.caffeine.xml @@ -1,2 +1,2 @@ - + diff --git a/libraries/coil/resources/intellij.libraries.coil.xml b/libraries/coil/resources/intellij.libraries.coil.xml index 6d7c7a3df37f..ccd4461f7d9e 100644 --- a/libraries/coil/resources/intellij.libraries.coil.xml +++ b/libraries/coil/resources/intellij.libraries.coil.xml @@ -1,4 +1,4 @@ - + diff --git a/libraries/commons/lang3/resources/intellij.libraries.commons.lang3.xml b/libraries/commons/lang3/resources/intellij.libraries.commons.lang3.xml index 6fb76a66265d..f88619559144 100644 --- a/libraries/commons/lang3/resources/intellij.libraries.commons.lang3.xml +++ b/libraries/commons/lang3/resources/intellij.libraries.commons.lang3.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/fastutil/resources/intellij.libraries.fastutil.xml b/libraries/fastutil/resources/intellij.libraries.fastutil.xml index 6fb76a66265d..f88619559144 100644 --- a/libraries/fastutil/resources/intellij.libraries.fastutil.xml +++ b/libraries/fastutil/resources/intellij.libraries.fastutil.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/guava/resources/intellij.libraries.guava.xml b/libraries/guava/resources/intellij.libraries.guava.xml index bf03841e6f89..f88619559144 100644 --- a/libraries/guava/resources/intellij.libraries.guava.xml +++ b/libraries/guava/resources/intellij.libraries.guava.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml b/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml index 6fb76a66265d..f88619559144 100644 --- a/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml +++ b/libraries/jgoodies/forms/resources/intellij.libraries.jgoodies.forms.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/jsoup/resources/intellij.libraries.jsoup.xml b/libraries/jsoup/resources/intellij.libraries.jsoup.xml index 6fb76a66265d..f88619559144 100644 --- a/libraries/jsoup/resources/intellij.libraries.jsoup.xml +++ b/libraries/jsoup/resources/intellij.libraries.jsoup.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/kotlin/reflect/resources/intellij.libraries.kotlin.reflect.xml b/libraries/kotlin/reflect/resources/intellij.libraries.kotlin.reflect.xml index bf03841e6f89..f88619559144 100644 --- a/libraries/kotlin/reflect/resources/intellij.libraries.kotlin.reflect.xml +++ b/libraries/kotlin/reflect/resources/intellij.libraries.kotlin.reflect.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/kotlinx/coroutines/core/resources/intellij.libraries.kotlinx.coroutines.core.xml b/libraries/kotlinx/coroutines/core/resources/intellij.libraries.kotlinx.coroutines.core.xml index bf03841e6f89..f88619559144 100644 --- a/libraries/kotlinx/coroutines/core/resources/intellij.libraries.kotlinx.coroutines.core.xml +++ b/libraries/kotlinx/coroutines/core/resources/intellij.libraries.kotlinx.coroutines.core.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/libraries/maven-resolver-provider/BUILD.bazel b/libraries/maven-resolver-provider/BUILD.bazel new file mode 100644 index 000000000000..001cab900240 --- /dev/null +++ b/libraries/maven-resolver-provider/BUILD.bazel @@ -0,0 +1,21 @@ +### auto-generated section `build intellij.libraries.maven.resolver.provider` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "maven-resolver-provider_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "maven-resolver-provider", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":maven-resolver-provider_resources"], + exports = ["@lib//:maven-resolver-provider"], + runtime_deps = [ + "@lib//:maven-resolver-provider", + "//libraries/plexus-utils", + ] +) +### auto-generated section `build intellij.libraries.maven.resolver.provider` end \ No newline at end of file diff --git a/libraries/maven-resolver-provider/intellij.libraries.maven.resolver.provider.iml b/libraries/maven-resolver-provider/intellij.libraries.maven.resolver.provider.iml new file mode 100644 index 000000000000..43d0ca16ddfe --- /dev/null +++ b/libraries/maven-resolver-provider/intellij.libraries.maven.resolver.provider.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/maven-resolver-provider/module-content.yaml b/libraries/maven-resolver-provider/module-content.yaml new file mode 100644 index 000000000000..1f3d426c7025 --- /dev/null +++ b/libraries/maven-resolver-provider/module-content.yaml @@ -0,0 +1,18 @@ +- name: dist.all/lib/intellij.libraries.maven.resolver.provider.jar + modules: + - name: intellij.libraries.maven.resolver.provider + library: maven-resolver-provider + files: + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3/maven-resolver-provider-3.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-model/3/maven-model-3.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3/maven-model-builder-3.jar + - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1/plexus-interpolation-1.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3/maven-artifact-3.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3/maven-builder-support-3.jar + - name: $MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0/org.eclipse.sisu.inject-0.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3/maven-repository-metadata-3.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1/maven-resolver-api-1.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1/maven-resolver-spi-1.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1/maven-resolver-util-1.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1/maven-resolver-impl-1.jar + - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1/maven-resolver-named-locks-1.jar \ No newline at end of file diff --git a/libraries/maven-resolver-provider/resources/intellij.libraries.maven.resolver.provider.xml b/libraries/maven-resolver-provider/resources/intellij.libraries.maven.resolver.provider.xml new file mode 100644 index 000000000000..377a93272cf5 --- /dev/null +++ b/libraries/maven-resolver-provider/resources/intellij.libraries.maven.resolver.provider.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/protobuf/BUILD.bazel b/libraries/protobuf/BUILD.bazel new file mode 100644 index 000000000000..652e3192ca76 --- /dev/null +++ b/libraries/protobuf/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.protobuf` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "protobuf_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "protobuf", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":protobuf_resources"], + exports = ["@lib//:protobuf"], + runtime_deps = ["@lib//:protobuf"] +) +### auto-generated section `build intellij.libraries.protobuf` end \ No newline at end of file diff --git a/libraries/protobuf/intellij.libraries.protobuf.iml b/libraries/protobuf/intellij.libraries.protobuf.iml new file mode 100644 index 000000000000..292c58d92feb --- /dev/null +++ b/libraries/protobuf/intellij.libraries.protobuf.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/protobuf/module-content.yaml b/libraries/protobuf/module-content.yaml new file mode 100644 index 000000000000..22efa4a21306 --- /dev/null +++ b/libraries/protobuf/module-content.yaml @@ -0,0 +1,6 @@ +- name: dist.all/lib/intellij.libraries.protobuf.jar + modules: + - name: intellij.libraries.protobuf + library: protobuf + files: + - name: $MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3/protobuf-java-3.jar \ No newline at end of file diff --git a/libraries/protobuf/resources/intellij.libraries.protobuf.xml b/libraries/protobuf/resources/intellij.libraries.protobuf.xml new file mode 100644 index 000000000000..bf03841e6f89 --- /dev/null +++ b/libraries/protobuf/resources/intellij.libraries.protobuf.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/libraries/swingx/BUILD.bazel b/libraries/swingx/BUILD.bazel index c4e599bfacb1..c1795f128e1b 100644 --- a/libraries/swingx/BUILD.bazel +++ b/libraries/swingx/BUILD.bazel @@ -12,7 +12,7 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), resources = [":swingx_resources"], - exports = ["@lib//:libraries-swingx-swingx"], - runtime_deps = ["@lib//:libraries-swingx-swingx"] + exports = ["@lib//:swingx"], + runtime_deps = ["@lib//:swingx"] ) ### auto-generated section `build intellij.libraries.swingx` end \ No newline at end of file diff --git a/libraries/swingx/module-content.yaml b/libraries/swingx/module-content.yaml index d88895c1579d..f3349763e095 100644 --- a/libraries/swingx/module-content.yaml +++ b/libraries/swingx/module-content.yaml @@ -1,6 +1,6 @@ - name: dist.all/lib/intellij.libraries.swingx.jar modules: - name: intellij.libraries.swingx - libraries: - swingx: - - name: $MAVEN_REPOSITORY$/org/swinglabs/swingx-core/1/swingx-core-1.jar \ No newline at end of file + library: swingx + files: + - name: $MAVEN_REPOSITORY$/org/swinglabs/swingx-core/1/swingx-core-1.jar \ No newline at end of file diff --git a/platform/analysis-api/resources/intellij.platform.analysis.xml b/platform/analysis-api/resources/intellij.platform.analysis.xml index 1cf8142c2ee2..8c03ec50237c 100644 --- a/platform/analysis-api/resources/intellij.platform.analysis.xml +++ b/platform/analysis-api/resources/intellij.platform.analysis.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 49128a071c5a..aafd4b3f21fd 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -39,7 +39,7 @@ jvm_library( "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "//libraries/fastutil", "//libraries/gson", - "@lib//:protobuf", + "//libraries/protobuf", "//build/tasks", "//build/deps:dependencies", "//platform/util/jdom", @@ -88,6 +88,7 @@ jvm_library( "@lib//:platform-build_scripts-jetbrains-intellij-deps-coverage-reporter", "//libraries/ktor/client", "//platform/plugins/parser/impl", + "//libraries/maven-resolver-provider", "//platform/build-scripts/api", "//platform/build-scripts/product-dsl", ], diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index 24609c6e9901..6cc1ce1f344b 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -52,7 +52,7 @@ - + @@ -420,6 +420,7 @@ + diff --git a/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt b/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt index 629dba9fcdeb..31492343bbfd 100644 --- a/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt +++ b/platform/build-scripts/product-dsl/src/ModuleDescriptorDependencyGenerator.kt @@ -49,7 +49,7 @@ internal suspend fun generateModuleDescriptorDependencies( ): DependencyGenerationResult = coroutineScope { val allModuleSets = communityModuleSets + coreModuleSets + ultimateModuleSets val embeddedModules = embeddedModulesDeferred?.await() ?: emptySet() - val modulesToProcess = collectModulesToProcess(allModuleSets) + val modulesToProcess = collectModulesToProcess(allModuleSets, embeddedModules) if (modulesToProcess.isEmpty()) { return@coroutineScope DependencyGenerationResult(emptyList()) } @@ -157,14 +157,11 @@ internal class ModuleDescriptorCache(private val moduleOutputProvider: ModuleOut * 1. Modules with includeDependencies=true * 2. Library modules (intellij.libraries.*) that are not embedded */ -private fun collectModulesToProcess(moduleSets: List): Set { +private fun collectModulesToProcess(moduleSets: List, embeddedModules: Set): Set { val result = mutableSetOf() for (set in moduleSets) { visitAllModules(set) { module -> - // todo enable for all on the next stage - if (module.includeDependencies || - module.name.startsWith(LIB_MODULE_PREFIX) || - module.name.startsWith("intellij.platform.settings.")) { + if (module.includeDependencies || module.name.startsWith(LIB_MODULE_PREFIX)) { result.add(module.name) } } diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt index 0bd8770f8664..77c097d6d8c2 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt @@ -21,7 +21,6 @@ object JavaPluginLayout { spec.withModule(moduleName, "jps-builders.jar") } spec.withModule("intellij.platform.jps.build.javac.rt", "jps-builders-6.jar") - spec.withModule("intellij.java.aetherDependencyResolver", "aether-dependency-resolver.jar") for (moduleName in listOf( "intellij.java.compiler.antTasks", @@ -59,7 +58,6 @@ object JavaPluginLayout { "intellij.java.execution.impl", "intellij.java.execution.impl.backend", "intellij.java.execution.impl.frontend", - "intellij.java.ui", "intellij.java.structureView", "intellij.java.manifest", "intellij.java.remoteServers.impl", 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 4eb781157d83..7c6921f85358 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 @@ -87,7 +87,6 @@ private val libsUsedInJps = setOf( "slf4j-jdk14", // see getBuildProcessApplicationClasspath - used in JPS "jna", - "maven-resolver-provider", // see ArtifactRepositoryManager.getClassesFromDependencies "kotlin-stdlib", ) @@ -102,7 +101,6 @@ private val predefinedMergeRules = listOf it.startsWith("org.codehaus.groovy:") }, "jsch-agent.jar" to { it, _ -> it.startsWith("jsch-agent") }, "opentelemetry.jar" to { it, _ -> it == "opentelemetry" || it == "opentelemetry-semconv" || it.startsWith("opentelemetry-exporter-otlp") }, - "bouncy-castle.jar" to { it, _ -> it.startsWith("bouncy-castle-") }, 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 @@ -145,13 +143,13 @@ class JarPackager private constructor( packager.computeModuleSources(includedModules = includedModules, layout = null, searchableOptionSet = null, cachedDescriptorWriterProvider = null) buildJars( assets = packager.assets.values, - layout = null, cache = if (context is BuildContextImpl) context.jarCacheManager else NonCachingJarCacheManager, - context = context, isCodesignEnabled = false, useCacheAsTargetFile = context.options.isUnpackedDist, dryRun = false, - helper = packager.helper + layout = null, + helper = packager.helper, + context = context ) } @@ -216,13 +214,13 @@ class JarPackager private constructor( val cacheManager = if (dryRun || context !is BuildContextImpl) NonCachingJarCacheManager else context.jarCacheManager val buildAssetResult = buildJars( assets = packager.assets.values, - layout = layout, cache = cacheManager, - context = context, isCodesignEnabled = isCodesignEnabled, useCacheAsTargetFile = !dryRun && context.options.isUnpackedDist, dryRun = dryRun, + layout = layout, helper = packager.helper, + context = context, ) return coroutineScope { @@ -623,7 +621,7 @@ class JarPackager private constructor( val (key, value) = iterator.next() if (predicate(key.name, frontendModuleFilter)) { iterator.remove() - result[key] = value + result.put(key, value) } } if (result.isEmpty()) { @@ -911,12 +909,12 @@ private data class CopiedFor(@JvmField val library: JpsLibrary, @JvmField val ta private suspend fun buildJars( assets: Collection, cache: JarCacheManager, - context: BuildContext, isCodesignEnabled: Boolean, useCacheAsTargetFile: Boolean, dryRun: Boolean, layout: BaseLayout?, helper: JarPackagerDependencyHelper, + context: BuildContext, ): BuildAssetResult { checkAssetUniqueness(assets) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt index 99f1323620ef..a80410029190 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt @@ -4,11 +4,11 @@ package org.jetbrains.intellij.build.impl import org.jetbrains.annotations.TestOnly -import org.jetbrains.intellij.build.BuildContext +import org.jetbrains.intellij.build.ModuleOutputProvider import org.jetbrains.intellij.build.impl.PlatformJarNames.APP_BACKEND_JAR +import org.jetbrains.intellij.build.productLayout.LIB_MODULE_PREFIX import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.library.JpsLibrary import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.model.module.JpsModuleReference @@ -55,13 +55,11 @@ class PlatformLayout(@JvmField val descriptorCacheContainer: DescriptorCacheCont projectLibraryToPolicy.put(libraryName, ProjectLibraryPackagingPolicy.EXCLUDE) } - fun collectProjectLibrariesFromIncludedModules(context: BuildContext, consumer: (JpsLibrary, JpsModule) -> Unit) { + fun collectProjectLibrariesFromIncludedModules(context: ModuleOutputProvider, consumer: (String, JpsModule) -> Unit) { val libsToUnpack = includedProjectLibraries.mapTo(LinkedHashSet(includedProjectLibraries.size)) { it.libraryName } val uniqueGuard = HashSet() for (item in includedModules) { - // libraries are packed into product module - // there are no strong valid reasons to check `item.includeDependencies` here, just to preserve current behavior and reduce scope of changes; it will be addressed later - if (item.isProductModule() && !item.includeDependencies) { + if (item.isProductModule()) { continue } @@ -72,14 +70,11 @@ class PlatformLayout(@JvmField val descriptorCacheContainer: DescriptorCacheCont val module = context.findRequiredModule(moduleName) for (library in JpsJavaExtensionService.dependencies(module).includedIn(JpsJavaClasspathKind.PRODUCTION_RUNTIME).libraries) { - if (!isSkippedLibrary(library, libsToUnpack)) { - consumer(library, module) + val libraryName = library.name + if (!libsToUnpack.contains(libraryName) && library.createReference().parentReference !is JpsModuleReference && !isProjectLibraryExcluded(libraryName)) { + consumer(libraryName, module) } } } } - - private fun isSkippedLibrary(library: JpsLibrary, libsToUnpack: Collection): Boolean { - return library.createReference().parentReference is JpsModuleReference || libsToUnpack.contains(library.name) || isProjectLibraryExcluded(library.name) - } } \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt index 7983f5ae3168..40afbcda1840 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt @@ -21,6 +21,7 @@ import org.jetbrains.intellij.build.UTIL_RT_JAR import org.jetbrains.intellij.build.classPath.getEmbeddedContentModulesOfPluginsWithUseIdeaClassloader import org.jetbrains.intellij.build.impl.PlatformJarNames.TEST_FRAMEWORK_JAR import org.jetbrains.intellij.build.isModuleNameLikeFilename +import org.jetbrains.intellij.build.productLayout.LIB_MODULE_PREFIX import org.jetbrains.intellij.build.productLayout.ProductModulesLayout import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService @@ -99,8 +100,6 @@ suspend fun createPlatformLayout(context: BuildContext): PlatformLayout { ) } -const val LIB_MODULE_PREFIX: String = "intellij.libraries." - internal suspend fun createPlatformLayout(projectLibrariesUsedByPlugins: SortedSet, context: BuildContext): PlatformLayout { val frontendModuleFilter = context.getFrontendModuleFilter() val productLayout = context.productProperties.productLayout @@ -315,8 +314,7 @@ internal suspend fun createPlatformLayout(projectLibrariesUsedByPlugins: SortedS } // as a separate step, not a part of computing implicitModules, as we should collect libraries from such implicitly included modules - layout.collectProjectLibrariesFromIncludedModules(context) { lib, module -> - val libName = lib.name + layout.collectProjectLibrariesFromIncludedModules(context) { libName, module -> // this module is used only when running IDE from sources, no need to include its dependencies, see IJPL-125 if (module.name == "intellij.platform.buildScripts.downloader" && libName == "zstd-jni") { return@collectProjectLibrariesFromIncludedModules diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productModuleLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productModuleLayout.kt index bc2940004e96..28bbbbf00d66 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productModuleLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productModuleLayout.kt @@ -18,6 +18,7 @@ import org.jetbrains.intellij.build.classPath.resolveAndEmbedContentModuleDescri import org.jetbrains.intellij.build.impl.PlatformJarNames.PRODUCT_BACKEND_JAR import org.jetbrains.intellij.build.impl.PlatformJarNames.PRODUCT_JAR import org.jetbrains.intellij.build.isOptionalLoadingRule +import org.jetbrains.intellij.build.productLayout.LIB_MODULE_PREFIX import org.jetbrains.intellij.build.productLayout.buildProductContentXml import org.jetbrains.jps.model.java.JavaSourceRootType diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt index 916bc5c72785..e6f9945d67fc 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt @@ -5,7 +5,6 @@ package org.jetbrains.intellij.build import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.trace.Span -import org.jetbrains.intellij.build.impl.LIB_MODULE_PREFIX import org.jetbrains.intellij.build.impl.projectStructureMapping.DistributionFileEntry import org.jetbrains.intellij.build.io.AddDirEntriesMode import org.jetbrains.intellij.build.io.INDEX_FILENAME @@ -15,6 +14,7 @@ import org.jetbrains.intellij.build.io.ZipFileWriter import org.jetbrains.intellij.build.io.archiveDir import org.jetbrains.intellij.build.io.suspendAwareReadZipFile import org.jetbrains.intellij.build.io.zipWriter +import org.jetbrains.intellij.build.productLayout.LIB_MODULE_PREFIX import java.io.IOException import java.nio.ByteBuffer import java.nio.file.Files diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt index 9316d8ec4781..1b669ecea05e 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt @@ -124,6 +124,7 @@ object CommunityModuleSets { embeddedModule("intellij.libraries.markdown") embeddedModule("intellij.libraries.mvstore") embeddedModule("intellij.libraries.oro.matcher") + embeddedModule("intellij.libraries.protobuf") embeddedModule("intellij.libraries.proxy.vole") embeddedModule("intellij.libraries.rhino") embeddedModule("intellij.libraries.snakeyaml") @@ -190,8 +191,8 @@ object CommunityModuleSets { module("intellij.libraries.kotlinx.document.store.mvstore") module("intellij.libraries.opencsv") module("intellij.libraries.lucene.common") - // todo - once intellij.java.aetherDependencyResolver will be migrated to product module, it can be a non-embedded module (see ArtifactRepositoryManager) - embeddedModule("intellij.libraries.plexus.utils") + module("intellij.libraries.plexus.utils") + module("intellij.libraries.maven.resolver.provider") } /** diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt index 73a1ca7c6aae..6b57e6b58ad8 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt @@ -58,6 +58,8 @@ object CoreModuleSets { embeddedModule("intellij.platform.util.ex") embeddedModule("intellij.platform.util.ui") + embeddedModule("intellij.platform.locking.impl") + embeddedModule("intellij.platform.core") embeddedModule("intellij.platform.core.ui") embeddedModule("intellij.platform.core.impl") @@ -307,6 +309,8 @@ object CoreModuleSets { embeddedModule("intellij.platform.externalSystem.dependencyUpdater") embeddedModule("intellij.platform.externalSystem.impl") embeddedModule("intellij.platform.externalProcessAuthHelper") + + module("intellij.java.aetherDependencyResolver") } /** diff --git a/platform/build-scripts/tests/BUILD.bazel b/platform/build-scripts/tests/BUILD.bazel index 96da3813484e..454b6a14e06a 100644 --- a/platform/build-scripts/tests/BUILD.bazel +++ b/platform/build-scripts/tests/BUILD.bazel @@ -45,7 +45,7 @@ jvm_library( "@lib//:netty-buffer", "//libraries/hash4j", "//libraries/fastutil", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//libraries/mockito", "@lib//:mockito-kotlin", "//jps/model-serialization", diff --git a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml index 7a1dca17dc1c..2b71d5998a6f 100644 --- a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml +++ b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml @@ -31,7 +31,7 @@ - + diff --git a/platform/core-api/resources/intellij.platform.core.xml b/platform/core-api/resources/intellij.platform.core.xml index 7a26ab4640e9..9f62d607e2dc 100644 --- a/platform/core-api/resources/intellij.platform.core.xml +++ b/platform/core-api/resources/intellij.platform.core.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/core-ui/resources/intellij.platform.core.ui.xml b/platform/core-ui/resources/intellij.platform.core.ui.xml index 9a3dca761d73..f52c8a65f92b 100644 --- a/platform/core-ui/resources/intellij.platform.core.ui.xml +++ b/platform/core-ui/resources/intellij.platform.core.ui.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/execution-process-mediator/client/BUILD.bazel b/platform/execution-process-mediator/client/BUILD.bazel index a783d9eb30d8..915335ce11c1 100644 --- a/platform/execution-process-mediator/client/BUILD.bazel +++ b/platform/execution-process-mediator/client/BUILD.bazel @@ -17,7 +17,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", "//libraries/guava", - "@lib//:protobuf", + "//libraries/protobuf", "//platform/execution-process-mediator/daemon", "//platform/execution-process-mediator/common", "//platform/core-api:core", @@ -40,7 +40,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", "//libraries/guava", - "@lib//:protobuf", + "//libraries/protobuf", "//platform/execution-process-mediator/daemon", "//platform/execution-process-mediator/common", "//platform/execution-process-mediator/common:common_test_lib", diff --git a/platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml b/platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml index 37915c583f06..fabdbf05e64e 100644 --- a/platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml +++ b/platform/execution-process-mediator/client/intellij.execution.process.mediator.client.iml @@ -12,7 +12,7 @@ - + diff --git a/platform/execution-process-mediator/common/BUILD.bazel b/platform/execution-process-mediator/common/BUILD.bazel index 099193388134..74f2c9176d2c 100644 --- a/platform/execution-process-mediator/common/BUILD.bazel +++ b/platform/execution-process-mediator/common/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "@lib//:jetbrains-annotations", "//libraries/guava", - "@lib//:protobuf", + "//libraries/protobuf", "//libraries/javax/annotation", "//libraries/grpc", ] @@ -34,7 +34,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "@lib//:jetbrains-annotations", "//libraries/guava", - "@lib//:protobuf", + "//libraries/protobuf", "//libraries/javax/annotation", "@lib//:junit5", "@lib//:execution-process-mediator-common-com-willowtreeapps-assertk-assertk-jvm", diff --git a/platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml b/platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml index fefce4f16cec..ff858e181930 100644 --- a/platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml +++ b/platform/execution-process-mediator/common/intellij.execution.process.mediator.common.iml @@ -14,7 +14,7 @@ - + diff --git a/platform/execution-process-mediator/daemon/BUILD.bazel b/platform/execution-process-mediator/daemon/BUILD.bazel index 833c651cb6bb..be17c3bb78cf 100644 --- a/platform/execution-process-mediator/daemon/BUILD.bazel +++ b/platform/execution-process-mediator/daemon/BUILD.bazel @@ -18,7 +18,7 @@ jvm_library( "//libraries/kotlinx/coroutines/core", "@lib//:jetbrains-annotations", "//libraries/guava", - "@lib//:protobuf", + "//libraries/protobuf", "@lib//:jna", "//platform/execution-process-mediator/common", "//libraries/grpc", diff --git a/platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml b/platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml index 02837ce956af..328d0f1676f8 100644 --- a/platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml +++ b/platform/execution-process-mediator/daemon/intellij.execution.process.mediator.daemon.iml @@ -12,7 +12,7 @@ - + diff --git a/platform/external-system-api/resources/intellij.platform.externalSystem.xml b/platform/external-system-api/resources/intellij.platform.externalSystem.xml index 07a40cbc5b3e..d044fe869a1a 100644 --- a/platform/external-system-api/resources/intellij.platform.externalSystem.xml +++ b/platform/external-system-api/resources/intellij.platform.externalSystem.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml index f46152bbf4c6..0708bbf5aba0 100644 --- a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml +++ b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml @@ -65,6 +65,7 @@ + @@ -101,6 +102,7 @@ + diff --git a/platform/lang-api/resources/intellij.platform.lang.xml b/platform/lang-api/resources/intellij.platform.lang.xml index a2c06ba2e8a7..a29df7ddf9ec 100644 --- a/platform/lang-api/resources/intellij.platform.lang.xml +++ b/platform/lang-api/resources/intellij.platform.lang.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/lang-core/resources/intellij.platform.lang.core.xml b/platform/lang-core/resources/intellij.platform.lang.core.xml index c5e291952375..8a2673022a82 100644 --- a/platform/lang-core/resources/intellij.platform.lang.core.xml +++ b/platform/lang-core/resources/intellij.platform.lang.core.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/lang-impl/resources/intellij.platform.lang.impl.xml b/platform/lang-impl/resources/intellij.platform.lang.impl.xml index 0240ed19bae9..60738028a355 100644 --- a/platform/lang-impl/resources/intellij.platform.lang.impl.xml +++ b/platform/lang-impl/resources/intellij.platform.lang.impl.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/locking.impl/BUILD.bazel b/platform/locking.impl/BUILD.bazel index c266fdd27261..d5da30f15e0b 100644 --- a/platform/locking.impl/BUILD.bazel +++ b/platform/locking.impl/BUILD.bazel @@ -1,11 +1,18 @@ ### auto-generated section `build intellij.platform.locking.impl` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "locking.impl_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "locking.impl", module_name = "intellij.platform.locking.impl", visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + resources = [":locking.impl_resources"], deps = [ "@lib//:kotlin-stdlib", "//libraries/kotlinx/coroutines/core", diff --git a/platform/locking.impl/intellij.platform.locking.impl.iml b/platform/locking.impl/intellij.platform.locking.impl.iml index d36104ad76e7..07be9935ce99 100644 --- a/platform/locking.impl/intellij.platform.locking.impl.iml +++ b/platform/locking.impl/intellij.platform.locking.impl.iml @@ -3,6 +3,7 @@ + diff --git a/platform/locking.impl/module-content.yaml b/platform/locking.impl/module-content.yaml new file mode 100644 index 000000000000..314adab87aa4 --- /dev/null +++ b/platform/locking.impl/module-content.yaml @@ -0,0 +1,6 @@ +- name: dist.all/lib/intellij.platform.locking.impl.jar + modules: + - name: intellij.platform.locking.impl + library: jetbrains.intellij.deps.rwmutex.idea + files: + - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/rwmutex-idea/0/rwmutex-idea-0.jar \ No newline at end of file diff --git a/platform/locking.impl/resources/intellij.platform.locking.impl.xml b/platform/locking.impl/resources/intellij.platform.locking.impl.xml new file mode 100644 index 000000000000..392873d5da0c --- /dev/null +++ b/platform/locking.impl/resources/intellij.platform.locking.impl.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index cd9f57955b55..4c2891a9e4b1 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -172,7 +172,7 @@ jvm_library( "@lib//:org-codehaus-groovy-groovy-json", "@lib//:org-codehaus-groovy-groovy-templates", "@lib//:org-codehaus-groovy-groovy-xml", - "@lib//:protobuf", + "//libraries/protobuf", "//libraries/jgoodies/common", "//libraries/jgoodies/forms", "//libraries/bouncy-castle-provider", diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index 363988776e27..239f65774872 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -102,7 +102,7 @@ - + diff --git a/platform/platform-impl/module-content.yaml b/platform/platform-impl/module-content.yaml index 7af30b495455..5bdc20867d67 100644 --- a/platform/platform-impl/module-content.yaml +++ b/platform/platform-impl/module-content.yaml @@ -13,7 +13,6 @@ - name: intellij.platform.ijent.community.buildConstants - name: intellij.platform.ijent.community.impl - name: intellij.platform.jbr - - name: intellij.platform.locking.impl - name: intellij.platform.objectSerializer - name: intellij.platform.pratt - name: intellij.platform.resources @@ -24,6 +23,6 @@ - name: intellij.platform.syntax.tree - name: intellij.platform.syntax.util - name: intellij.platform.ui.jcef - library: jetbrains.intellij.deps.rwmutex.idea + library: zip-signer files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/rwmutex-idea/0/rwmutex-idea-0.jar \ No newline at end of file + - name: $MAVEN_REPOSITORY$/org/jetbrains/marketplace-zip-signer/0/marketplace-zip-signer-0.jar \ No newline at end of file diff --git a/platform/platform-impl/resources/intellij.platform.ide.impl.xml b/platform/platform-impl/resources/intellij.platform.ide.impl.xml index d18cbdfcea0d..8287d3f00c71 100644 --- a/platform/platform-impl/resources/intellij.platform.ide.impl.xml +++ b/platform/platform-impl/resources/intellij.platform.ide.impl.xml @@ -1,4 +1,4 @@ - + @@ -35,6 +35,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml index 48a53b2a7ae2..66c5bdb4195c 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml @@ -66,6 +66,7 @@ + @@ -102,6 +103,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml index f5c6ab9c5fa7..f4cc4df2808c 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml @@ -67,6 +67,7 @@ + @@ -103,6 +104,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml index 50917f275d18..1c77aad3b73b 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml @@ -10,7 +10,6 @@ - @@ -68,6 +67,7 @@ + @@ -104,6 +104,7 @@ + @@ -181,7 +182,8 @@ - + + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml index 2132c47b03ec..e532cfe81edb 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml @@ -11,7 +11,6 @@ - @@ -69,6 +68,7 @@ + @@ -105,6 +105,7 @@ + @@ -182,7 +183,8 @@ - + + @@ -256,6 +258,7 @@ + \ No newline at end of file diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml index 93bb88c5fda0..3a476ef3c54b 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml @@ -14,7 +14,6 @@ - @@ -72,6 +71,7 @@ + @@ -108,6 +108,7 @@ + @@ -185,7 +186,8 @@ - + + @@ -259,6 +261,7 @@ + diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.misc.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.misc.xml index 45bf35772e25..084f2c0f3d29 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.misc.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.misc.xml @@ -9,6 +9,7 @@ - + + \ No newline at end of file diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml index 0735a3a1d724..33451732e81f 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml @@ -64,6 +64,7 @@ + diff --git a/platform/projectModel-api/resources/intellij.platform.projectModel.xml b/platform/projectModel-api/resources/intellij.platform.projectModel.xml index 7879fd86336a..d62eaee62e7b 100644 --- a/platform/projectModel-api/resources/intellij.platform.projectModel.xml +++ b/platform/projectModel-api/resources/intellij.platform.projectModel.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/smRunner/resources/intellij.platform.smRunner.xml b/platform/smRunner/resources/intellij.platform.smRunner.xml index d5e04ba51b3b..28ad0014bc77 100644 --- a/platform/smRunner/resources/intellij.platform.smRunner.xml +++ b/platform/smRunner/resources/intellij.platform.smRunner.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/util/ui/resources/intellij.platform.util.ui.xml b/platform/util/ui/resources/intellij.platform.util.ui.xml index abb91042fde5..4432ef43f8c2 100644 --- a/platform/util/ui/resources/intellij.platform.util.ui.xml +++ b/platform/util/ui/resources/intellij.platform.util.ui.xml @@ -1,4 +1,4 @@ - + diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel index a68fd402e497..9ed476de4095 100644 --- a/plugins/devkit/devkit-core/BUILD.bazel +++ b/plugins/devkit/devkit-core/BUILD.bazel @@ -63,7 +63,7 @@ jvm_library( "//java/idea-ui:ui", "//platform/usageView", "//jvm/jvm-analysis-api:analysis", - "@lib//:protobuf", + "//libraries/protobuf", "//aether-dependency-resolver", "//platform/service-container", "//platform/platform-api:ide", diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml index 348d7d08b4d9..5395258bcc4c 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.core.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml @@ -69,7 +69,7 @@ - + diff --git a/plugins/grazie/plugin-content.yaml b/plugins/grazie/plugin-content.yaml index 3ddf1019b0cc..d74d2b842eda 100644 --- a/plugins/grazie/plugin-content.yaml +++ b/plugins/grazie/plugin-content.yaml @@ -117,9 +117,8 @@ - name: lib/grazie.jar modules: - name: intellij.grazie - - name: intellij.grazie.core - reason: <- intellij.grazie contentModules: + - name: intellij.grazie.core - name: intellij.grazie.json - name: intellij.grazie.markdown - name: intellij.grazie.xml diff --git a/plugins/grazie/resources/META-INF/plugin.xml b/plugins/grazie/resources/META-INF/plugin.xml index a94b889d08f7..40c6bf37b47d 100644 --- a/plugins/grazie/resources/META-INF/plugin.xml +++ b/plugins/grazie/resources/META-INF/plugin.xml @@ -24,15 +24,12 @@ ]]> - - - - + diff --git a/plugins/grazie/src/main/resources/intellij.grazie.core.xml b/plugins/grazie/src/main/resources/intellij.grazie.core.xml new file mode 100644 index 000000000000..b999b0e4b21f --- /dev/null +++ b/plugins/grazie/src/main/resources/intellij.grazie.core.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel index d2beeb4c9703..327e1d518c2f 100644 --- a/plugins/groovy/BUILD.bazel +++ b/plugins/groovy/BUILD.bazel @@ -73,7 +73,7 @@ jvm_library( "//plugins/groovy/groovy-psi:psi", "//platform/external-system-api:externalSystem", "//RegExpSupport:regexp", - "@lib//:protobuf", + "//libraries/protobuf", "//platform/util-class-loader:util-classLoader", "//platform/core-ui", "//libraries/fastutil", @@ -171,7 +171,7 @@ jvm_library( "//RegExpSupport:regexp_test_lib", "//platform/external-system-impl:externalSystem-impl", "//platform/lang-impl:lang-tests_test_lib", - "@lib//:protobuf", + "//libraries/protobuf", "//platform/util-class-loader:util-classLoader", "//platform/core-ui", "//libraries/fastutil", diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml index d4aeda4c3d55..eaaf15c5f95c 100644 --- a/plugins/groovy/intellij.groovy.iml +++ b/plugins/groovy/intellij.groovy.iml @@ -66,7 +66,7 @@ - + diff --git a/plugins/kotlin/base/plugin/BUILD.bazel b/plugins/kotlin/base/plugin/BUILD.bazel index 2b4b8516e3de..a6ed86e5ea66 100644 --- a/plugins/kotlin/base/plugin/BUILD.bazel +++ b/plugins/kotlin/base/plugin/BUILD.bazel @@ -95,7 +95,7 @@ jvm_library( "//platform/testFramework:testFramework_test_lib", "//platform/ide-core", "//platform/core-ui", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//platform/util", "//platform/build-scripts/downloader", "//platform/lang-core", diff --git a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml index 6dc595353cc5..ccd3bf2dda54 100644 --- a/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml +++ b/plugins/kotlin/base/plugin/intellij.kotlin.base.plugin.iml @@ -41,7 +41,7 @@ - + diff --git a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel index a7274082506a..4fe190cc8f37 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel +++ b/plugins/kotlin/jvm-debugger/coroutines/BUILD.bazel @@ -29,7 +29,7 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//java/debugger/openapi:java-debugger", "@lib//:kotlinc-analysis-api", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//libraries/gson", "//libraries/asm", "//platform/analysis-api:analysis", diff --git a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml index 1c29a768753d..d35a64eb5501 100644 --- a/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml +++ b/plugins/kotlin/jvm-debugger/coroutines/intellij.kotlin.jvm.debugger.coroutines.iml @@ -34,7 +34,7 @@ - + diff --git a/plugins/kotlin/project-configuration/BUILD.bazel b/plugins/kotlin/project-configuration/BUILD.bazel index 82714c9d88b5..82959e362b1c 100644 --- a/plugins/kotlin/project-configuration/BUILD.bazel +++ b/plugins/kotlin/project-configuration/BUILD.bazel @@ -57,7 +57,7 @@ jvm_library( "//platform/diff-impl", "//platform/core-api:core", "//platform/util/coroutines", - "@lib//:maven-resolver-provider", + "//libraries/maven-resolver-provider", "//platform/util", "//platform/workspace/storage", "//platform/vcs-impl/shared", diff --git a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml index 8aa396e063f6..9b47fafa5488 100644 --- a/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml +++ b/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml @@ -51,7 +51,7 @@ - + diff --git a/plugins/markdown/compose/src/main/resources/intellij.markdown.compose.preview.xml b/plugins/markdown/compose/src/main/resources/intellij.markdown.compose.preview.xml index d434c2105152..5bbe1c930744 100644 --- a/plugins/markdown/compose/src/main/resources/intellij.markdown.compose.preview.xml +++ b/plugins/markdown/compose/src/main/resources/intellij.markdown.compose.preview.xml @@ -2,6 +2,10 @@ + + + + diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index fff2d0e65115..acd1e7812039 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -66,6 +66,7 @@ + org.intellij.groovy