diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4568e1a64c77..67abb6ee0c17 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1885,8 +1885,6 @@
-
-
diff --git a/BUILD.bazel b/BUILD.bazel
index bb659afa2fd4..984a3d606ade 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -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",
diff --git a/build/BUILD.bazel b/build/BUILD.bazel
index f870f0bde90d..9a11c74c9e9e 100644
--- a/build/BUILD.bazel
+++ b/build/BUILD.bazel
@@ -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
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index a75c1b14518c..9336590139f8 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -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
diff --git a/community-resources/BUILD.bazel b/community-resources/BUILD.bazel
index ef8bf9ecb0e1..3d4e38172319 100644
--- a/community-resources/BUILD.bazel
+++ b/community-resources/BUILD.bazel
@@ -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",
diff --git a/ideTipsAndTricks/BUILD.bazel b/ideTipsAndTricks/BUILD.bazel
new file mode 100644
index 000000000000..8a07e245b142
--- /dev/null
+++ b/ideTipsAndTricks/BUILD.bazel
@@ -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
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index cb1611e6ae38..529037bf741d 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -125,8 +125,6 @@
-
-
diff --git a/intellij.idea.community.main.tests.iml b/intellij.idea.community.main.tests.iml
index 6779b4c1568a..fd616a7153b9 100644
--- a/intellij.idea.community.main.tests.iml
+++ b/intellij.idea.community.main.tests.iml
@@ -248,8 +248,6 @@
-
-
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
index b6d8364a3a54..bf3fd637d9d9 100644
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -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",
diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel
index 81b877561f27..b6ea2e700e7a 100644
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -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",
diff --git a/openide/BUILD.bazel b/openide/BUILD.bazel
new file mode 100644
index 000000000000..1550892b7362
--- /dev/null
+++ b/openide/BUILD.bazel
@@ -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
diff --git a/openide/src/ru/openide/OpenIdePluginBundler.kt b/openide/src/ru/openide/OpenIdePluginBundler.kt
index ea73def919d1..164a4645cb6e 100644
--- a/openide/src/ru/openide/OpenIdePluginBundler.kt
+++ b/openide/src/ru/openide/OpenIdePluginBundler.kt
@@ -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 {
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 9aeaa56509c8..02900fd5b5ad 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
@@ -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")
diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel
index b4a0d2090f41..d16e468f01de 100644
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -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",
],
)
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/AgreementUi.kt b/platform/platform-impl/src/com/intellij/ide/gdpr/AgreementUi.kt
index 2c151a50fcb5..90ebf27c1cfc 100644
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/AgreementUi.kt
+++ b/platform/platform-impl/src/com/intellij/ide/gdpr/AgreementUi.kt
@@ -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
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 b417ef191384..22b573cb890c 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
@@ -414,7 +414,6 @@
-
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index dfe9c0dfe8e9..fc35f51a8ff7 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -1245,9 +1245,9 @@
-
-
-
+
+
+
diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt
index a1a224575a50..d26f933efcfc 100644
--- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt
+++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbImportServiceImpl.kt
@@ -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(