Skip to content

Commit ca1d9ba

Browse files
VISTALLVISTALL
committed
drop ide.api usage
1 parent 9f8496a commit ca1d9ba

19 files changed

Lines changed: 1289 additions & 43 deletions

File tree

‎iron-python/pom.xml‎

Lines changed: 99 additions & 2 deletions
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.ide-api-provided</artifactId>
22+
<artifactId>arch.bind.java</artifactId>
2323
<version>3-SNAPSHOT</version>
2424
<relativePath/>
2525
</parent>
@@ -73,6 +73,12 @@
7373
</build>
7474

7575
<dependencies>
76+
<dependency>
77+
<groupId>${project.groupId}</groupId>
78+
<artifactId>consulo.python-python.psi.api</artifactId>
79+
<version>${project.version}</version>
80+
<scope>provided</scope>
81+
</dependency>
7682
<dependency>
7783
<groupId>${project.groupId}</groupId>
7884
<artifactId>consulo.python-python.impl</artifactId>
@@ -92,5 +98,96 @@
9298
<version>${project.version}</version>
9399
<scope>provided</scope>
94100
</dependency>
101+
102+
<dependency>
103+
<groupId>consulo</groupId>
104+
<artifactId>consulo-ide-api</artifactId>
105+
<version>${project.version}</version>
106+
<scope>provided</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>consulo</groupId>
110+
<artifactId>consulo-application-api</artifactId>
111+
<version>${project.version}</version>
112+
<scope>provided</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>consulo</groupId>
116+
<artifactId>consulo-application-content-api</artifactId>
117+
<version>${project.version}</version>
118+
<scope>provided</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>consulo</groupId>
122+
<artifactId>consulo-disposer-api</artifactId>
123+
<version>${project.version}</version>
124+
<scope>provided</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>consulo</groupId>
128+
<artifactId>consulo-language-api</artifactId>
129+
<version>${project.version}</version>
130+
<scope>provided</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>consulo</groupId>
134+
<artifactId>consulo-language-editor-api</artifactId>
135+
<version>${project.version}</version>
136+
<scope>provided</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>consulo</groupId>
140+
<artifactId>consulo-module-api</artifactId>
141+
<version>${project.version}</version>
142+
<scope>provided</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>consulo</groupId>
146+
<artifactId>consulo-module-content-api</artifactId>
147+
<version>${project.version}</version>
148+
<scope>provided</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>consulo</groupId>
152+
<artifactId>consulo-module-ui-api</artifactId>
153+
<version>${project.version}</version>
154+
<scope>provided</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>consulo</groupId>
158+
<artifactId>consulo-process-api</artifactId>
159+
<version>${project.version}</version>
160+
<scope>provided</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>consulo</groupId>
164+
<artifactId>consulo-project-api</artifactId>
165+
<version>${project.version}</version>
166+
<scope>provided</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>consulo</groupId>
170+
<artifactId>consulo-project-content-api</artifactId>
171+
<version>${project.version}</version>
172+
<scope>provided</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>consulo</groupId>
176+
<artifactId>consulo-ui-api</artifactId>
177+
<version>${project.version}</version>
178+
<scope>provided</scope>
179+
</dependency>
180+
<dependency>
181+
<groupId>consulo</groupId>
182+
<artifactId>consulo-util-collection</artifactId>
183+
<version>${project.version}</version>
184+
<scope>provided</scope>
185+
</dependency>
186+
<dependency>
187+
<groupId>consulo</groupId>
188+
<artifactId>consulo-util-lang</artifactId>
189+
<version>${project.version}</version>
190+
<scope>provided</scope>
191+
</dependency>
95192
</dependencies>
96-
</project>
193+
</project>

‎iron-python/src/main/java/module-info.java‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,27 @@
33
* @since 18/06/2023
44
*/
55
module consulo.iron.python {
6-
requires consulo.ide.api;
6+
requires consulo.application.api;
7+
requires consulo.application.content.api;
8+
requires consulo.disposer.api;
9+
requires consulo.language.api;
10+
requires consulo.language.editor.api;
11+
requires consulo.module.api;
12+
requires consulo.module.content.api;
13+
requires consulo.module.ui.api;
14+
requires consulo.process.api;
15+
requires consulo.project.api;
16+
requires consulo.project.content.api;
17+
requires consulo.ui.api;
18+
requires consulo.util.collection;
19+
requires consulo.util.lang;
20+
721
requires consulo.python.impl;
22+
requires consulo.python.language.api;
823

924
requires consulo.dotnet.psi.api;
1025

11-
requires consulo.python.language.api;
12-
1326
exports consulo.ironPython.module.extension;
1427
exports consulo.ironPython.psi.impl;
1528
exports consulo.ironPython.sdk.flavors;
16-
}
29+
}

‎jython/pom.xml‎

Lines changed: 111 additions & 2 deletions
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.ide-api-provided</artifactId>
22+
<artifactId>arch.bind.java</artifactId>
2323
<version>3-SNAPSHOT</version>
2424
<relativePath/>
2525
</parent>
@@ -73,6 +73,12 @@
7373
</build>
7474

7575
<dependencies>
76+
<dependency>
77+
<groupId>${project.groupId}</groupId>
78+
<artifactId>consulo.python-python.psi.api</artifactId>
79+
<version>${project.version}</version>
80+
<scope>provided</scope>
81+
</dependency>
7682
<dependency>
7783
<groupId>${project.groupId}</groupId>
7884
<artifactId>consulo.python-python.impl</artifactId>
@@ -86,5 +92,108 @@
8692
<version>${project.version}</version>
8793
<scope>provided</scope>
8894
</dependency>
95+
96+
<dependency>
97+
<groupId>consulo</groupId>
98+
<artifactId>consulo-ide-api</artifactId>
99+
<version>${project.version}</version>
100+
<scope>provided</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>consulo</groupId>
104+
<artifactId>consulo-application-api</artifactId>
105+
<version>${project.version}</version>
106+
<scope>provided</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>consulo</groupId>
110+
<artifactId>consulo-application-content-api</artifactId>
111+
<version>${project.version}</version>
112+
<scope>provided</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>consulo</groupId>
116+
<artifactId>consulo-disposer-api</artifactId>
117+
<version>${project.version}</version>
118+
<scope>provided</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>consulo</groupId>
122+
<artifactId>consulo-language-api</artifactId>
123+
<version>${project.version}</version>
124+
<scope>provided</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>consulo</groupId>
128+
<artifactId>consulo-language-editor-api</artifactId>
129+
<version>${project.version}</version>
130+
<scope>provided</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>consulo</groupId>
134+
<artifactId>consulo-localize-api</artifactId>
135+
<version>${project.version}</version>
136+
<scope>provided</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>consulo</groupId>
140+
<artifactId>consulo-module-api</artifactId>
141+
<version>${project.version}</version>
142+
<scope>provided</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>consulo</groupId>
146+
<artifactId>consulo-module-content-api</artifactId>
147+
<version>${project.version}</version>
148+
<scope>provided</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>consulo</groupId>
152+
<artifactId>consulo-module-ui-api</artifactId>
153+
<version>${project.version}</version>
154+
<scope>provided</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>consulo</groupId>
158+
<artifactId>consulo-process-api</artifactId>
159+
<version>${project.version}</version>
160+
<scope>provided</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>consulo</groupId>
164+
<artifactId>consulo-project-api</artifactId>
165+
<version>${project.version}</version>
166+
<scope>provided</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>consulo</groupId>
170+
<artifactId>consulo-project-content-api</artifactId>
171+
<version>${project.version}</version>
172+
<scope>provided</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>consulo</groupId>
176+
<artifactId>consulo-ui-api</artifactId>
177+
<version>${project.version}</version>
178+
<scope>provided</scope>
179+
</dependency>
180+
<dependency>
181+
<groupId>consulo</groupId>
182+
<artifactId>consulo-util-collection</artifactId>
183+
<version>${project.version}</version>
184+
<scope>provided</scope>
185+
</dependency>
186+
<dependency>
187+
<groupId>consulo</groupId>
188+
<artifactId>consulo-util-io</artifactId>
189+
<version>${project.version}</version>
190+
<scope>provided</scope>
191+
</dependency>
192+
<dependency>
193+
<groupId>consulo</groupId>
194+
<artifactId>consulo-util-lang</artifactId>
195+
<version>${project.version}</version>
196+
<scope>provided</scope>
197+
</dependency>
89198
</dependencies>
90-
</project>
199+
</project>

‎jython/src/main/java/module-info.java‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,31 @@
33
* @since 18/06/2023
44
*/
55
module consulo.jython {
6-
requires consulo.ide.api;
6+
requires consulo.application.api;
7+
requires consulo.application.content.api;
8+
requires consulo.disposer.api;
9+
requires consulo.language.api;
10+
requires consulo.language.editor.api;
11+
requires consulo.localize.api;
12+
requires consulo.module.api;
13+
requires consulo.module.content.api;
14+
requires consulo.module.ui.api;
15+
requires consulo.process.api;
16+
requires consulo.project.api;
17+
requires consulo.project.content.api;
18+
requires consulo.ui.api;
19+
requires consulo.util.collection;
20+
requires consulo.util.io;
21+
requires consulo.util.lang;
22+
723
requires consulo.python.impl;
24+
requires consulo.python.language.api;
825

926
requires consulo.java.language.api;
1027
requires consulo.java.language.impl;
1128

12-
requires consulo.python.language.api;
13-
1429
exports com.jetbrains.python.jython.psi.impl;
1530
exports com.jetbrains.python.jython.sdk.flavors;
1631
exports consulo.jython.icon;
1732
exports consulo.jython.module.extension;
18-
}
33+
}

‎plugin/pom.xml‎

Lines changed: 27 additions & 2 deletions
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.ide-api-provided</artifactId>
22+
<artifactId>arch.bind.java</artifactId>
2323
<version>3-SNAPSHOT</version>
2424
<relativePath/>
2525
</parent>
@@ -149,5 +149,30 @@
149149
<version>${project.version}</version>
150150
<scope>provided</scope>
151151
</dependency>
152+
153+
<dependency>
154+
<groupId>consulo</groupId>
155+
<artifactId>consulo-ide-api</artifactId>
156+
<version>${project.version}</version>
157+
<scope>provided</scope>
158+
</dependency>
159+
<dependency>
160+
<groupId>consulo</groupId>
161+
<artifactId>consulo-document-api</artifactId>
162+
<version>${project.version}</version>
163+
<scope>provided</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>consulo</groupId>
167+
<artifactId>consulo-language-api</artifactId>
168+
<version>${project.version}</version>
169+
<scope>provided</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>consulo</groupId>
173+
<artifactId>consulo-language-inject-advanced-api</artifactId>
174+
<version>${project.version}</version>
175+
<scope>provided</scope>
176+
</dependency>
152177
</dependencies>
153-
</project>
178+
</project>

‎plugin/src/main/java/module-info.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
* @since 18/06/2023
44
*/
55
module consulo.python {
6-
requires consulo.ide.api;
6+
requires consulo.document.api;
7+
requires consulo.language.api;
8+
requires consulo.language.inject.advanced.api;
9+
710
requires consulo.python.language.api;
811
requires consulo.python.impl;
9-
}
12+
13+
requires org.jdom;
14+
}

0 commit comments

Comments
 (0)