From 5219e4de24fb7cc233575eaf223b5773204894c3 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Tue, 27 May 2025 17:43:50 +0200 Subject: [PATCH] [tasks] convert intellij.platform.tasks.impl to a content module (IJPL-189531) This is needed to have an explicit dependency on the backend in it (IJPL-188916), also, it fixes the problem with missing dependency on vcs.impl module (IJPL-160364). The change shouldn't affect external plugins which use classes from that module, because the new module will be automatically added to their dependencies. GitOrigin-RevId: 991b8cdc1547a9b44028e704dc3d5d576f53b7e9 --- .../src/org/jetbrains/intellij/build/impl/PlatformModules.kt | 2 +- .../src/com/intellij/ide/plugins/ModulesWithDependencies.kt | 3 ++- .../platform-resources/src/META-INF/PlatformLangPlugin.xml | 3 --- .../platform-resources/src/META-INF/common-ide-modules.xml | 1 + .../{META-INF/tasks.xml => intellij.platform.tasks.impl.xml} | 3 +++ plugins/tasks/tasks-core/resources/META-INF/plugin.xml | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) rename platform/tasks-platform-impl/resources/{META-INF/tasks.xml => intellij.platform.tasks.impl.xml} (95%) 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 9003029c694f..b5eaf316426d 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 @@ -71,7 +71,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of( "intellij.platform.scriptDebugger.ui", "intellij.platform.smRunner", "intellij.platform.structureView.impl", - "intellij.platform.tasks.impl", + "intellij.platform.tasks", "intellij.platform.testRunner", "intellij.platform.rd.community", "intellij.remoteDev.util", diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt index 1adc8c4d2098..d08e814513a6 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt @@ -176,7 +176,8 @@ private val knownNotFullyMigratedPluginIds: Set = hashSetOf( * To avoid breaking compatibility, dependencies on these modules are automatically added to plugins which define dependency on the platform using * `com.intellij.modules.platformcom.intellij.modules.lang( +private val contentModulesExtractedInCorePluginWhichCanBeUsedFromExternalPlugins = listOf( + "intellij.platform.tasks.impl", ) private fun collectDirectDependenciesInOldFormat(rootDescriptor: IdeaPluginDescriptorImpl, diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index bd7242eb4415..fbcea8187eb8 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -182,9 +182,6 @@ - - - diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml index 287fb95b8e34..c771b68873b3 100644 --- a/platform/platform-resources/src/META-INF/common-ide-modules.xml +++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml @@ -7,6 +7,7 @@ + diff --git a/platform/tasks-platform-impl/resources/META-INF/tasks.xml b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml similarity index 95% rename from platform/tasks-platform-impl/resources/META-INF/tasks.xml rename to platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml index 568257b11ee5..3b58ec188c78 100644 --- a/platform/tasks-platform-impl/resources/META-INF/tasks.xml +++ b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml @@ -1,4 +1,7 @@ + + + diff --git a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml index 13b1289d8da6..b62abc60f38c 100644 --- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml +++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml @@ -16,6 +16,7 @@ + com.intellij.java