MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

OpenIDE fix bazel ploblems

Browse Source
This commit is contained in:
Nikita Iarychenko
2026-09-17 12:44:42 +04:00
parent 5414841e38
commit fe02604366
18 changed files with 140 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
-2
View File
@@ -1885,8 +1885,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" filepath="$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" />
<!-- <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />-->
<!-- <module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />-->
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/sh/core/intellij.sh.core.iml" filepath="$PROJECT_DIR$/plugins/sh/core/intellij.sh.core.iml" />
BUILD.bazel
-8
View File
@@ -271,8 +271,6 @@ jvm_library(
"//plugins/webp",
"//plugins/emojipicker",
"//plugins/gradle/gradle-dependency-updater:dependencyUpdater",
"//platform/settings-sync-core:settingsSync-core",
"//plugins/settings-sync/jba:settingsSync",
"//java/java-features-trainer:featuresTrainer",
"//plugins/ml-local-models/java",
"//plugins/kotlin:kotlin-plugin-community-main",
@@ -458,8 +456,6 @@ jvm_library(
"//plugins/webp:webp_test_lib",
"//plugins/emojipicker:emojipicker_test_lib",
"//plugins/gradle/gradle-dependency-updater:dependencyUpdater_test_lib",
"//platform/settings-sync-core:settingsSync-core_test_lib",
"//plugins/settings-sync/jba:settingsSync_test_lib",
"//java/java-features-trainer:featuresTrainer_test_lib",
"//plugins/ml-local-models/java:java_test_lib",
"//plugins/kotlin:kotlin-plugin-community-main_test_lib",
@@ -1101,10 +1097,6 @@ jvm_library(
"//plugins/search-everywhere-ml/ranking/core:searchEverywhereMl-ranking-core-tests_test_lib",
"//plugins/search-everywhere-ml/typos:searchEverywhereMl-typos-tests",
"//plugins/search-everywhere-ml/typos:searchEverywhereMl-typos-tests_test_lib",
"//platform/settings-sync-core:settingsSync-core-tests",
"//platform/settings-sync-core:settingsSync-core-tests_test_lib",
"//plugins/settings-sync/jba:settingsSync-tests",
"//plugins/settings-sync/jba:settingsSync-tests_test_lib",
"//plugins/testng:testng-tests",
"//plugins/testng:testng-tests_test_lib",
"//plugins/textmate/joni:joni-tests",
build/BUILD.bazel
+2
View File
@@ -165,6 +165,7 @@ jvm_library(
"//platform/build-scripts/downloader",
"@community//build:zip",
"//libraries/maven-resolver-provider",
"//openide",
],
)
@@ -198,6 +199,7 @@ jvm_library(
"//platform/build-scripts/downloader:downloader_test_lib",
"@community//build:zip_test_lib",
"//libraries/maven-resolver-provider:maven-resolver-provider_test_lib",
"//openide:openide_test_lib",
],
)
### auto-generated section `build intellij.idea.community.build` end
build/bazel-generated-file-list.txt
+2 -3
View File
@@ -274,6 +274,7 @@ grid/impl-ide
grid/json
grid/plugin
grid/types
ideTipsAndTricks
idea/customization/backend
idea/customization/base
idea/customization/min
@@ -564,6 +565,7 @@ mps/build/intellij.mps.resources
notebooks/notebook-ui
notebooks/visualization
notebooks/visualization/testFramework
openide
platform/acp
platform/acp/plugin
platform/acp/tests
@@ -856,7 +858,6 @@ platform/searchEverywhere/testFramework
platform/service-container
platform/settings
platform/settings-local
platform/settings-sync-core
platform/smRunner
platform/smRunner/vcs
platform/smart-update
@@ -1500,8 +1501,6 @@ plugins/search-everywhere-ml/ranking/vcs
plugins/search-everywhere-ml/ranking/yaml
plugins/search-everywhere-ml/typos
plugins/settings-repository
plugins/settings-sync/jba
plugins/settings-sync/settingsSync.performanceTesting
plugins/sh/backend
plugins/sh/copyright
plugins/sh/core
community-resources/BUILD.bazel
+2 -1
View File
@@ -17,7 +17,7 @@ jvm_library(
runtime_deps = [
# do not sort,
"//java/ide-resources",
"@lib//:idea-community-customization-tips-idea-ce",
"//ideTipsAndTricks",
"//platform/platform-impl:ide-impl",
"//idea/customization/min",
"//idea/customization/base",
@@ -38,6 +38,7 @@ jvm_library(
# do not sort,
":customization",
"//java/ide-resources:ide-resources_test_lib",
"//ideTipsAndTricks:ideTipsAndTricks_test_lib",
"//platform/platform-impl:ide-impl_test_lib",
"//idea/customization/min:min_test_lib",
"//idea/customization/base:base_test_lib",
ideTipsAndTricks/BUILD.bazel
+39
View File
@@ -0,0 +1,39 @@
load("@rules_jvm//:jvm.bzl", "jvm_library")
### auto-generated section `build org.openide.ideTipsAndTricks` start
jvm_library(
name = "ideTipsAndTricks",
srcs = glob(
[],
allow_empty = True,
),
module_name = "org.openide.ideTipsAndTricks",
resource_strip_prefix = "resources",
resources = glob(
["resources/**/*"],
),
visibility = ["//visibility:public"],
)
jvm_library(
name = "ideTipsAndTricks_test_lib",
testonly = True,
srcs = glob(
[],
allow_empty = True,
),
module_name = "org.openide.ideTipsAndTricks",
visibility = ["//visibility:public"],
runtime_deps = [":ideTipsAndTricks"],
)
### auto-generated section `build org.openide.ideTipsAndTricks` end
### auto-generated section `iml org.openide.ideTipsAndTricks` start
exports_files(
[
"org.openide.ideTipsAndTricks.iml",
],
visibility = ["//visibility:public"],
)
### auto-generated section `iml org.openide.ideTipsAndTricks` end
intellij.idea.community.main.iml
-2
View File
@@ -125,8 +125,6 @@
<orderEntry type="module" module-name="intellij.webp" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.emojipicker" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.gradle.dependencyUpdater" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.settingsSync.core" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.settingsSync" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.featuresTrainer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.ml.models.local.java" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.kotlin.plugin.community.main" scope="RUNTIME" />
intellij.idea.community.main.tests.iml
-2
View File
@@ -248,8 +248,6 @@
<orderEntry type="module" module-name="intellij.searchEverywhereLucene.backend.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.searchEverywhereMl.ranking.core.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.searchEverywhereMl.typos.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.settingsSync.core.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.settingsSync.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.testng.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.textmate.joni.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark.tests" scope="TEST" />
lib/BUILD.bazel
+15 -14
View File
@@ -5920,20 +5920,6 @@ jvm_import(
source_jar = "@org_apache_httpcomponents-httpcore-4_4_16-sources_http//file",
)
copy_file(
name = "com.jetbrains.intellij.documentation/tips-intellij-idea-community-241.62.jar_copy",
src = "@com_jetbrains_intellij_documentation-tips-intellij-idea-community-241_62_http//file",
out = "com.jetbrains.intellij.documentation/tips-intellij-idea-community-241.62.jar",
allow_symlink = True,
visibility = ["//visibility:public"],
)
jvm_import(
name = "idea-community-customization-tips-idea-ce",
jar = "@com_jetbrains_intellij_documentation-tips-intellij-idea-community-241_62_http//file",
visibility = ["//visibility:public"],
)
copy_file(
name = "org.jetbrains.intellij.plugins/structure-intellij-3.330.jar_copy",
src = "@org_jetbrains_intellij_plugins-structure-intellij-3_330_http//file",
@@ -6229,6 +6215,21 @@ jvm_import(
source_jar = "@io_qameta_allure-allure-model-2_25_0-sources_http//file",
)
copy_file(
name = "io.sentry/sentry-7.8.0.jar_copy",
src = "@io_sentry-sentry-7_8_0_http//file",
out = "io.sentry/sentry-7.8.0.jar",
allow_symlink = True,
visibility = ["//visibility:public"],
)
jvm_import(
name = "io-sentry",
jar = "@io_sentry-sentry-7_8_0_http//file",
source_jar = "@io_sentry-sentry-7_8_0-sources_http//file",
visibility = ["//visibility:public"],
)
copy_file(
name = "org.apache.maven.resolver/maven-resolver-connector-basic-1.9.22.jar_copy",
src = "@org_apache_maven_resolver-maven-resolver-connector-basic-1_9_22_http//file",
lib/MODULE.bazel
+14 -7
View File
@@ -4704,13 +4704,6 @@ http_file(
url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16-sources.jar",
)
http_file(
name = "com_jetbrains_intellij_documentation-tips-intellij-idea-community-241_62_http",
downloaded_file_path = "tips-intellij-idea-community-241.62.jar",
sha256 = "e46de060e29f3d060de5a9dab21711ff4d376e4b2a7e96d332415df60b7d77c8",
url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/intellij/documentation/tips-intellij-idea-community/241.62/tips-intellij-idea-community-241.62.jar",
)
http_file(
name = "org_jetbrains_intellij_plugins-structure-intellij-3_330_http",
downloaded_file_path = "structure-intellij-3.330.jar",
@@ -4963,6 +4956,20 @@ http_file(
url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/qameta/allure/allure-model/2.25.0/allure-model-2.25.0-sources.jar",
)
http_file(
name = "io_sentry-sentry-7_8_0_http",
downloaded_file_path = "sentry-7.8.0.jar",
sha256 = "927f0dfd76c9262f3d755345d72468138ae1bdba5d8f20c44f79ba2e1efcdb91",
url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/sentry/sentry/7.8.0/sentry-7.8.0.jar",
)
http_file(
name = "io_sentry-sentry-7_8_0-sources_http",
downloaded_file_path = "sentry-7.8.0-sources.jar",
sha256 = "a082b6c0a0bf5ee86b29b21ecd030a9083c4b3dc5ddbdf0ee430b6139851e844",
url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/sentry/sentry/7.8.0/sentry-7.8.0-sources.jar",
)
http_file(
name = "org_apache_maven_resolver-maven-resolver-connector-basic-1_9_22_http",
downloaded_file_path = "maven-resolver-connector-basic-1.9.22.jar",
openide/BUILD.bazel
+59
View File
@@ -0,0 +1,59 @@
load("@rules_jvm//:jvm.bzl", "jvm_library")
### auto-generated section `build openide` start
jvm_library(
name = "openide",
srcs = glob(
[
"src/**/*.kt",
"src/**/*.java",
"src/**/*.form",
],
allow_empty = True,
),
module_name = "openide",
visibility = ["//visibility:public"],
deps = [
# do not sort,
"@lib//:kotlin-stdlib",
"//platform/ide-core",
"//platform/util/jdom",
"//platform/build-scripts/downloader",
"//platform/build-scripts",
"//platform/util",
"//platform/platform-util-io:ide-util-io",
"@lib//:kotlinx-coroutines-core",
],
)
jvm_library(
name = "openide_test_lib",
testonly = True,
srcs = glob(
[],
allow_empty = True,
),
module_name = "openide",
visibility = ["//visibility:public"],
runtime_deps = [
# do not sort,
":openide",
"//platform/ide-core:ide-core_test_lib",
"//platform/util/jdom:jdom_test_lib",
"//platform/build-scripts/downloader:downloader_test_lib",
"//platform/build-scripts:build-scripts_test_lib",
"//platform/util:util_test_lib",
"//platform/platform-util-io:ide-util-io_test_lib",
],
)
### auto-generated section `build openide` end
### auto-generated section `iml openide` start
exports_files(
[
"openide.iml",
],
visibility = ["//visibility:public"],
)
### auto-generated section `iml openide` end
openide/src/ru/openide/OpenIdePluginBundler.kt
+2 -2
View File
@@ -33,8 +33,8 @@ object OpenIdePluginBundler {
private val plugins = listOf(
Marketplace("com.haulmont.intellij.rupack", "ru_pack"),
Marketplace("ru.openide.pro.updater", "updater"),
Marketplace("com.haulmont.amplicode", "amplicode"),
DirectUrl("https://download.openide.ru/plugins/OpenIDE-DB-Client-0.0.17.zip", "dbclient")
//Marketplace("com.haulmont.amplicode", "amplicode"),
//DirectUrl("https://download.openide.ru/plugins/OpenIDE-DB-Client-0.0.17.zip", "dbclient")
)
fun getBundlePluginPaths(context: BuildContext): List<Path> {
platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
-1
View File
@@ -397,7 +397,6 @@ object CommunityModuleSets {
module("intellij.platform.diagnostic.freezeAnalyzer")
module("intellij.platform.warmup")
module("intellij.platform.inspect")
module("intellij.settingsSync.core")
module("intellij.spellchecker")
module("intellij.spellchecker.xml")
module("intellij.platform.buildView")
platform/platform-impl/BUILD.bazel
+1
View File
@@ -189,6 +189,7 @@ jvm_library(
"//platform/forms_rt:java-guiForms-rt",
"//fleet/rhizomedb",
"@lib//:jetbrains-intellij-deps-java-atk-wrapper-linux",
"@lib//:io-sentry",
],
)
platform/platform-impl/src/com/intellij/ide/gdpr/AgreementUi.kt
-1
View File
@@ -22,7 +22,6 @@ import com.intellij.ui.components.JBScrollPane
import com.intellij.util.ui.HTMLEditorKitBuilder
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.SwingHelper
import org.jetbrains.annotations.ApiStatus
import java.awt.BorderLayout
import java.awt.event.ActionListener
import javax.accessibility.AccessibleContext
platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
-1
View File
@@ -414,7 +414,6 @@
<module name="intellij.platform.diagnostic.freezeAnalyzer"/>
<module name="intellij.platform.warmup"/>
<module name="intellij.platform.inspect"/>
<module name="intellij.settingsSync.core"/>
<module name="intellij.spellchecker"/>
<module name="intellij.spellchecker.xml"/>
<module name="intellij.platform.buildView"/>
platform/platform-resources/src/idea/PlatformActions.xml
+3 -3
View File
@@ -1245,9 +1245,9 @@
</group>
<group id="WelcomeScreen.LearnIdeHelp" searchable="false">
<action id="WhatsNewAction" class="com.intellij.ide.actions.WhatsNewAction">
<add-to-group group-id="HelpMenu" anchor="after" relative-to-action="LearnGroup"/>
</action>
<!--<action id="WhatsNewAction" class="com.intellij.ide.actions.WhatsNewAction">-->
<!-- <add-to-group group-id="HelpMenu" anchor="after" relative-to-action="LearnGroup"/>-->
<!--</action>-->
<reference ref="HelpTopics"/>
<reference ref="OnlineDocAction"/>
<reference ref="Help.JetBrainsTV"/>
plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt
+1 -1
View File
@@ -424,7 +424,7 @@ class JbImportServiceImpl(private val coroutineScope: CoroutineScope) : JbServic
plugins2import = productInfo.getPluginsDescriptors().filter {
setting.selectedChildIds?.contains(it.key.idString) ?: false
}.filter { (_, descriptor) ->
PluginManagerCore.isCompatible(descriptor) && descriptor.namespace?.lowercase() != "jetbrains"
PluginManagerCore.isCompatible(descriptor)
}
unselectedPlugins = setting.unselectedChildIds
logger.info(