Skip to content

Commit 5120c53

Browse files
committed
reduce ide.api dependencies
1 parent dcb46d7 commit 5120c53

5 files changed

Lines changed: 524 additions & 21 deletions

File tree

grammar-kit-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>consulo</groupId>
22-
<artifactId>arch.bind</artifactId>
22+
<artifactId>arch.bind.java</artifactId>
2323
<version>3-SNAPSHOT</version>
2424
<relativePath/>
2525
</parent>

grammar-kit/pom.xml

Lines changed: 186 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,196 @@
4141
</repositories>
4242

4343
<dependencies>
44-
<!-- required transitively by com.intellij.xml -->
44+
<!-- platform -->
45+
<dependency>
46+
<groupId>consulo</groupId>
47+
<artifactId>consulo-application-api</artifactId>
48+
<version>${project.version}</version>
49+
<scope>provided</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>consulo</groupId>
53+
<artifactId>consulo-code-editor-api</artifactId>
54+
<version>${project.version}</version>
55+
<scope>provided</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>consulo</groupId>
59+
<artifactId>consulo-color-scheme-api</artifactId>
60+
<version>${project.version}</version>
61+
<scope>provided</scope>
62+
</dependency>
63+
<dependency>
64+
<groupId>consulo</groupId>
65+
<artifactId>consulo-component-api</artifactId>
66+
<version>${project.version}</version>
67+
<scope>provided</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>consulo</groupId>
71+
<artifactId>consulo-datacontext-api</artifactId>
72+
<version>${project.version}</version>
73+
<scope>provided</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>consulo</groupId>
77+
<artifactId>consulo-document-api</artifactId>
78+
<version>${project.version}</version>
79+
<scope>provided</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>consulo</groupId>
83+
<artifactId>consulo-file-chooser-api</artifactId>
84+
<version>${project.version}</version>
85+
<scope>provided</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>consulo</groupId>
89+
<artifactId>consulo-file-editor-api</artifactId>
90+
<version>${project.version}</version>
91+
<scope>provided</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>consulo</groupId>
95+
<artifactId>consulo-language-api</artifactId>
96+
<version>${project.version}</version>
97+
<scope>provided</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>consulo</groupId>
101+
<artifactId>consulo-language-editor-api</artifactId>
102+
<version>${project.version}</version>
103+
<scope>provided</scope>
104+
</dependency>
105+
<dependency>
106+
<groupId>consulo</groupId>
107+
<artifactId>consulo-language-editor-refactoring-api</artifactId>
108+
<version>${project.version}</version>
109+
<scope>provided</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>consulo</groupId>
113+
<artifactId>consulo-language-editor-ui-api</artifactId>
114+
<version>${project.version}</version>
115+
<scope>provided</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>consulo</groupId>
119+
<artifactId>consulo-language-impl</artifactId>
120+
<version>${project.version}</version>
121+
<scope>provided</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>consulo</groupId>
125+
<artifactId>consulo-localize-api</artifactId>
126+
<version>${project.version}</version>
127+
<scope>provided</scope>
128+
</dependency>
129+
<dependency>
130+
<groupId>consulo</groupId>
131+
<artifactId>consulo-logging-api</artifactId>
132+
<version>${project.version}</version>
133+
<scope>provided</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>consulo</groupId>
137+
<artifactId>consulo-module-api</artifactId>
138+
<version>${project.version}</version>
139+
<scope>provided</scope>
140+
</dependency>
141+
<dependency>
142+
<groupId>consulo</groupId>
143+
<artifactId>consulo-navigation-api</artifactId>
144+
<version>${project.version}</version>
145+
<scope>provided</scope>
146+
</dependency>
147+
<dependency>
148+
<groupId>consulo</groupId>
149+
<artifactId>consulo-base-icon-library</artifactId>
150+
<version>${project.version}</version>
151+
<scope>provided</scope>
152+
</dependency>
153+
<dependency>
154+
<groupId>consulo</groupId>
155+
<artifactId>consulo-project-api</artifactId>
156+
<version>${project.version}</version>
157+
<scope>provided</scope>
158+
</dependency>
159+
<dependency>
160+
<groupId>consulo</groupId>
161+
<artifactId>consulo-project-ui-api</artifactId>
162+
<version>${project.version}</version>
163+
<scope>provided</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>consulo</groupId>
167+
<artifactId>consulo-ui-api</artifactId>
168+
<version>${project.version}</version>
169+
<scope>provided</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>consulo</groupId>
173+
<artifactId>consulo-ui-ex-api</artifactId>
174+
<version>${project.version}</version>
175+
<scope>provided</scope>
176+
</dependency>
177+
<dependency>
178+
<groupId>consulo</groupId>
179+
<artifactId>consulo-ui-ex-awt-api</artifactId>
180+
<version>${project.version}</version>
181+
<scope>provided</scope>
182+
</dependency>
183+
<dependency>
184+
<groupId>consulo</groupId>
185+
<artifactId>consulo-usage-api</artifactId>
186+
<version>${project.version}</version>
187+
<scope>provided</scope>
188+
</dependency>
189+
<dependency>
190+
<groupId>consulo</groupId>
191+
<artifactId>consulo-util-collection</artifactId>
192+
<version>${project.version}</version>
193+
<scope>provided</scope>
194+
</dependency>
195+
<dependency>
196+
<groupId>consulo</groupId>
197+
<artifactId>consulo-util-dataholder</artifactId>
198+
<version>${project.version}</version>
199+
<scope>provided</scope>
200+
</dependency>
201+
<dependency>
202+
<groupId>consulo</groupId>
203+
<artifactId>consulo-util-io</artifactId>
204+
<version>${project.version}</version>
205+
<scope>provided</scope>
206+
</dependency>
45207
<dependency>
46208
<groupId>consulo</groupId>
47-
<artifactId>consulo-ide-api</artifactId>
209+
<artifactId>consulo-util-lang</artifactId>
48210
<version>${project.version}</version>
49211
<scope>provided</scope>
50212
</dependency>
213+
<dependency>
214+
<groupId>consulo</groupId>
215+
<artifactId>consulo-virtual-file-system-api</artifactId>
216+
<version>${project.version}</version>
217+
<scope>provided</scope>
218+
</dependency>
219+
220+
<dependency>
221+
<groupId>consulo.internal.org.objectweb.asm</groupId>
222+
<artifactId>asm</artifactId>
223+
<version>9.6.1</version>
224+
<scope>provided</scope>
225+
</dependency>
226+
227+
<dependency>
228+
<groupId>org.apache.velocity</groupId>
229+
<artifactId>velocity-engine-core</artifactId>
230+
<scope>provided</scope>
231+
</dependency>
232+
233+
<!-- required transitively by com.intellij.xml -->
51234
<dependency>
52235
<groupId>${project.groupId}</groupId>
53236
<artifactId>consulo.java</artifactId>
@@ -68,12 +251,5 @@
68251
<scope>provided</scope>
69252
</dependency>
70253

71-
<dependency>
72-
<groupId>consulo</groupId>
73-
<artifactId>consulo-ide-impl</artifactId>
74-
<version>${project.version}</version>
75-
<scope>provided</scope>
76-
<optional>true</optional>
77-
</dependency>
78254
</dependencies>
79-
</project>
255+
</project>

grammar-kit/src/main/java/module-info.java

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,38 @@
33
* @since 2023-02-10
44
*/
55
module consulo.devkit.grammar.kit {
6+
requires consulo.application.api;
7+
requires consulo.code.editor.api;
8+
requires consulo.color.scheme.api;
9+
requires consulo.component.api;
10+
requires consulo.datacontext.api;
11+
requires consulo.document.api;
12+
requires consulo.file.chooser.api;
13+
requires consulo.file.editor.api;
14+
requires consulo.language.api;
15+
requires consulo.language.editor.api;
16+
requires consulo.language.editor.refactoring.api;
17+
requires consulo.language.editor.ui.api;
18+
requires consulo.language.impl;
19+
requires consulo.localize.api;
20+
requires consulo.logging.api;
21+
requires consulo.module.api;
22+
requires consulo.navigation.api;
23+
requires consulo.base.icon.library;
24+
requires consulo.project.api;
25+
requires consulo.project.ui.api;
26+
requires consulo.ui.api;
27+
requires consulo.ui.ex.api;
28+
requires consulo.ui.ex.awt.api;
29+
requires consulo.usage.api;
30+
requires consulo.util.collection;
31+
requires consulo.util.dataholder;
32+
requires consulo.util.io;
33+
requires consulo.util.lang;
34+
requires consulo.virtual.file.system.api;
35+
requires asm;
36+
requires velocity.engine.core;
37+
638
requires consulo.devkit.grammar.kit.core;
739
requires consulo.java.language.api;
840
requires consulo.java.debugger.impl;
@@ -11,7 +43,6 @@
1143

1244
// TODO remove in future
1345
requires java.desktop;
14-
requires consulo.ide.impl;
1546

1647
exports consulo.devkit.grammarKit.impl;
1748
exports org.intellij.grammar.impl;
@@ -24,4 +55,4 @@
2455
exports org.intellij.grammar.impl.livePreview;
2556
exports org.intellij.grammar.impl.psi.impl;
2657
exports org.intellij.grammar.impl.refactor;
27-
}
58+
}

0 commit comments

Comments
 (0)