MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[intellij project configuration] fix dependency on intellij.terminal.sh module

Browse Source 
The dependency from 'intellij.terminal' to 'intellij.terminal.sh' was removed because it brings optional 'intellij.terminal.sh' to all modules which depend on 'intellij.terminal'. It causes problems, for example, for JetBrains Client, because it adds 'intellij.platfrom.vcs.impl' (via 'intellij.sh.copyright' and 'intellij.copyright') to the classpath of 'intellij.cwm.guest.main' and JBC doesn't expect to load VCS components.

Also, 'intellij.terminal.sh' module is explicitly included in 'intellij.terminal' plugin layout.

GitOrigin-RevId: 1384914a858581254c86a6cee1b66adc529c13a0
This commit is contained in:
Nikolay Chashnikov
2023-07-17 15:06:10 +02:00
committed by intellij-monorepo-bot
parent ef1048dd54
commit 4e79cfd19a
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intellij.idea.community.main.iml
View File

@@ -137,6 +137,7 @@
<orderEntry type="module" module-name="intellij.platform.workspace.storage.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.workspace.jps.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.sh" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.terminal.sh" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.gradle.java.maven" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.markdown" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.textmate" scope="TEST" />

3
platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
View File

@@ -204,7 +204,8 @@ object CommunityRepositoryModules {
spec.withModule("intellij.java.decompiler.engine", spec.mainJarName)
},
javaFXPlugin("intellij.javaFX.community"),
pluginAuto(listOf("intellij.terminal")) { spec ->
plugin("intellij.terminal") { spec ->
spec.withModule("intellij.terminal.sh")
spec.withResource("resources/shell-integrations", "shell-integrations")
},
plugin("intellij.emojipicker") { spec ->

1
plugins/terminal/intellij.terminal.iml
View File

@@ -86,6 +86,5 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.terminal.sh" scope="RUNTIME" />
</component>
</module>

1
python/intellij.pycharm.community.main.iml
View File

@@ -26,6 +26,7 @@
<orderEntry type="module" module-name="intellij.completionMlRanking" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.statsCollector" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.sh" />
<orderEntry type="module" module-name="intellij.terminal.sh" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.vcs.changeReminder" />
<orderEntry type="module" module-name="intellij.xml.langInjection" />
<orderEntry type="module" module-name="intellij.textmate" />