Skip to content

Commit c9321f8

Browse files
VISTALLVISTALL
committed
reduce dependency to impl modules, and ide.api
1 parent 69d2381 commit c9321f8

24 files changed

Lines changed: 630 additions & 552 deletions

File tree

‎csharp-api/pom.xml‎

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,67 @@
1616
- limitations under the License.
1717
-->
1818
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20-
<modelVersion>4.0.0</modelVersion>
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2121

22-
<parent>
23-
<groupId>consulo</groupId>
24-
<artifactId>arch.ide-api-provided</artifactId>
25-
<version>3-SNAPSHOT</version>
26-
<relativePath/>
27-
</parent>
22+
<parent>
23+
<groupId>consulo</groupId>
24+
<artifactId>arch.bind.java</artifactId>
25+
<version>3-SNAPSHOT</version>
26+
<relativePath/>
27+
</parent>
2828

29-
<repositories>
30-
<repository>
31-
<id>consulo</id>
32-
<url>https://maven.consulo.dev/repository/snapshots/</url>
33-
<snapshots>
34-
<enabled>true</enabled>
35-
<updatePolicy>interval:60</updatePolicy>
36-
</snapshots>
37-
</repository>
38-
</repositories>
29+
<repositories>
30+
<repository>
31+
<id>consulo</id>
32+
<url>https://maven.consulo.dev/repository/snapshots/</url>
33+
<snapshots>
34+
<enabled>true</enabled>
35+
<updatePolicy>interval:60</updatePolicy>
36+
</snapshots>
37+
</repository>
38+
</repositories>
3939

40-
<build>
41-
<plugins>
42-
<plugin>
43-
<groupId>consulo.maven</groupId>
44-
<artifactId>maven-consulo-plugin</artifactId>
45-
<extensions>true</extensions>
46-
<executions>
47-
<execution>
48-
<phase>generate-sources</phase>
49-
<goals>
50-
<goal>generate-localize</goal>
51-
</goals>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
</plugins>
56-
</build>
40+
<build>
41+
<plugins>
42+
<plugin>
43+
<groupId>consulo.maven</groupId>
44+
<artifactId>maven-consulo-plugin</artifactId>
45+
<extensions>true</extensions>
46+
<executions>
47+
<execution>
48+
<phase>generate-sources</phase>
49+
<goals>
50+
<goal>generate-localize</goal>
51+
</goals>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
</plugins>
56+
</build>
5757

58-
<groupId>consulo.plugin</groupId>
59-
<artifactId>consulo.csharp-csharp.api</artifactId>
60-
<version>3-SNAPSHOT</version>
61-
<packaging>jar</packaging>
58+
<groupId>consulo.plugin</groupId>
59+
<artifactId>consulo.csharp-csharp.api</artifactId>
60+
<version>3-SNAPSHOT</version>
61+
<packaging>jar</packaging>
6262

63-
<dependencies>
64-
<dependency>
65-
<groupId>${project.groupId}</groupId>
66-
<artifactId>consulo.dotnet</artifactId>
67-
<version>${project.version}</version>
68-
<scope>provided</scope>
69-
</dependency>
70-
</dependencies>
63+
<dependencies>
64+
<dependency>
65+
<groupId>consulo</groupId>
66+
<artifactId>consulo-language-api</artifactId>
67+
<version>${project.version}</version>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>consulo</groupId>
72+
<artifactId>consulo-module-ui-api</artifactId>
73+
<version>${project.version}</version>
74+
</dependency>
75+
76+
<dependency>
77+
<groupId>${project.groupId}</groupId>
78+
<artifactId>consulo.dotnet-dotnet.api</artifactId>
79+
<version>${project.version}</version>
80+
</dependency>
81+
</dependencies>
7182
</project>

‎csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
import consulo.csharp.module.CSharpNullableOption;
2323
import consulo.csharp.module.extension.CSharpModuleExtension;
2424
import consulo.dotnet.DotNetTarget;
25-
import consulo.dotnet.compiler.DotNetCompileFailedException;
26-
import consulo.dotnet.compiler.DotNetCompilerMessage;
27-
import consulo.dotnet.compiler.DotNetCompilerOptionsBuilder;
28-
import consulo.dotnet.compiler.DotNetMacroUtil;
29-
import consulo.dotnet.impl.compiler.DotNetCompilerUtil;
25+
import consulo.dotnet.compiler.*;
3026
import consulo.dotnet.module.extension.DotNetModuleExtension;
3127
import consulo.language.util.ModuleUtilCore;
3228
import consulo.logging.Logger;

‎csharp-api/src/main/java/module-info.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
* @author VISTALL
33
* @since 10-Sep-22
44
*/
5-
module consulo.csharp.api
6-
{
7-
requires transitive consulo.ide.api;
8-
requires transitive consulo.dotnet.api;
9-
requires consulo.dotnet.impl;
5+
module consulo.csharp.api {
6+
requires transitive consulo.dotnet.api;
7+
requires transitive consulo.module.api;
8+
requires consulo.compiler.api;
9+
requires consulo.process.api;
10+
requires consulo.module.ui.api;
1011

11-
exports consulo.csharp;
12-
exports consulo.csharp.api.localize;
13-
exports consulo.csharp.compiler;
14-
exports consulo.csharp.module;
15-
exports consulo.csharp.module.extension;
12+
exports consulo.csharp;
13+
exports consulo.csharp.api.localize;
14+
exports consulo.csharp.compiler;
15+
exports consulo.csharp.module;
16+
exports consulo.csharp.module.extension;
1617
}

‎csharp-base-impl/pom.xml‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,47 @@
1717
-->
1818

1919
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
2222

23-
<parent>
24-
<groupId>consulo</groupId>
25-
<artifactId>arch.ide-api-provided</artifactId>
26-
<version>3-SNAPSHOT</version>
27-
<relativePath/>
28-
</parent>
23+
<parent>
24+
<groupId>consulo</groupId>
25+
<artifactId>arch.bind.java</artifactId>
26+
<version>3-SNAPSHOT</version>
27+
<relativePath/>
28+
</parent>
2929

30-
<repositories>
31-
<repository>
32-
<id>consulo</id>
33-
<url>https://maven.consulo.dev/repository/snapshots/</url>
34-
<snapshots>
35-
<enabled>true</enabled>
36-
<updatePolicy>interval:60</updatePolicy>
37-
</snapshots>
38-
</repository>
39-
</repositories>
30+
<repositories>
31+
<repository>
32+
<id>consulo</id>
33+
<url>https://maven.consulo.dev/repository/snapshots/</url>
34+
<snapshots>
35+
<enabled>true</enabled>
36+
<updatePolicy>interval:60</updatePolicy>
37+
</snapshots>
38+
</repository>
39+
</repositories>
4040

41-
<groupId>consulo.plugin</groupId>
42-
<artifactId>consulo.csharp-csharp.base.impl</artifactId>
43-
<version>3-SNAPSHOT</version>
44-
<packaging>jar</packaging>
41+
<groupId>consulo.plugin</groupId>
42+
<artifactId>consulo.csharp-csharp.base.impl</artifactId>
43+
<version>3-SNAPSHOT</version>
44+
<packaging>jar</packaging>
4545

46-
<dependencies>
47-
<dependency>
48-
<groupId>${project.groupId}</groupId>
49-
<artifactId>consulo.csharp-csharp.api</artifactId>
50-
<version>${project.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>${project.groupId}</groupId>
54-
<artifactId>consulo.csharp-csharp.psi.impl</artifactId>
55-
<version>${project.version}</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>${project.groupId}</groupId>
59-
<artifactId>consulo.dotnet</artifactId>
60-
<version>${project.version}</version>
61-
<scope>provided</scope>
62-
</dependency>
63-
</dependencies>
46+
<dependencies>
47+
<dependency>
48+
<groupId>${project.groupId}</groupId>
49+
<artifactId>consulo.csharp-csharp.api</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>${project.groupId}</groupId>
54+
<artifactId>consulo.csharp-csharp.psi.impl</artifactId>
55+
<version>${project.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>${project.groupId}</groupId>
59+
<artifactId>consulo.dotnet-dotnet.api</artifactId>
60+
<version>${project.version}</version>
61+
</dependency>
62+
</dependencies>
6463
</project>

‎csharp-base-impl/src/main/java/consulo/csharp/base/module/extension/CSharpConfigurationPanel.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import consulo.content.bundle.Sdk;
1919
import consulo.content.bundle.SdkModel;
20+
import consulo.content.bundle.SdkModelFactory;
2021
import consulo.content.bundle.SdkType;
2122
import consulo.csharp.compiler.CSharpCompilerProvider;
2223
import consulo.csharp.compiler.CSharpPlatform;
@@ -25,8 +26,6 @@
2526
import consulo.csharp.module.extension.CSharpModuleExtension;
2627
import consulo.csharp.module.extension.CSharpMutableModuleExtension;
2728
import consulo.dotnet.module.extension.DotNetSimpleModuleExtension;
28-
import consulo.ide.setting.ProjectStructureSettingsUtil;
29-
import consulo.ide.setting.ShowSettingsUtil;
3029
import consulo.language.util.ModuleUtilCore;
3130
import consulo.localize.LocalizeValue;
3231
import consulo.module.Module;
@@ -179,8 +178,8 @@ protected void textChanged(DocumentEvent e) {
179178
}
180179
}
181180

182-
ProjectStructureSettingsUtil settingsUtil = ShowSettingsUtil.getInstance();
183-
SdkModel model = settingsUtil.getSdksModel();
181+
SdkModelFactory settingsUtil = SdkModelFactory.getInstance();
182+
SdkModel model = settingsUtil.getOrCreateModel();
184183
SdkComboBox compilerComboBox = new SdkComboBox(
185184
model,
186185
compilerBundleTypes::contains,

‎csharp-base-impl/src/main/java/module-info.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
module consulo.csharp.base.impl {
66
// TODO remove in future
77
requires java.desktop;
8+
requires consulo.ui.ex.awt.api;
89

910
requires transitive consulo.csharp.api;
1011
requires transitive consulo.csharp.psi.impl;
11-
requires transitive consulo.dotnet.impl;
12+
requires transitive consulo.dotnet.api;
1213
requires transitive consulo.dotnet.psi.api;
1314

15+
requires consulo.module.ui.api;
16+
1417
exports consulo.csharp.base.compiler;
1518
exports consulo.csharp.base.module.extension;
1619

‎csharp-composite-formatting-string-api/pom.xml‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,33 @@
1717
-->
1818

1919
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21-
<modelVersion>4.0.0</modelVersion>
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
2222

23-
<parent>
24-
<groupId>consulo</groupId>
25-
<artifactId>arch.ide-api-provided</artifactId>
26-
<version>3-SNAPSHOT</version>
27-
<relativePath/>
28-
</parent>
23+
<parent>
24+
<groupId>consulo</groupId>
25+
<artifactId>arch.bind.java</artifactId>
26+
<version>3-SNAPSHOT</version>
27+
<relativePath/>
28+
</parent>
2929

30-
<repositories>
31-
<repository>
32-
<id>consulo</id>
33-
<url>https://maven.consulo.dev/repository/snapshots/</url>
34-
<snapshots>
35-
<enabled>true</enabled>
36-
<updatePolicy>interval:60</updatePolicy>
37-
</snapshots>
38-
</repository>
39-
</repositories>
30+
<repositories>
31+
<repository>
32+
<id>consulo</id>
33+
<url>https://maven.consulo.dev/repository/snapshots/</url>
34+
<snapshots>
35+
<enabled>true</enabled>
36+
<updatePolicy>interval:60</updatePolicy>
37+
</snapshots>
38+
</repository>
39+
</repositories>
4040

41-
<groupId>consulo.plugin</groupId>
42-
<artifactId>consulo.csharp-csharp-composite.formatting.string.api</artifactId>
43-
<version>3-SNAPSHOT</version>
44-
<packaging>jar</packaging>
41+
<groupId>consulo.plugin</groupId>
42+
<artifactId>consulo.csharp-csharp-composite.formatting.string.api</artifactId>
43+
<version>3-SNAPSHOT</version>
44+
<packaging>jar</packaging>
4545

46-
<dependencies>
47-
<dependency>
48-
<groupId>${project.groupId}</groupId>
49-
<artifactId>consulo.dotnet</artifactId>
50-
<version>${project.version}</version>
51-
<scope>provided</scope>
52-
</dependency>
53-
</dependencies>
46+
<dependencies>
47+
48+
</dependencies>
5449
</project>

0 commit comments

Comments
 (0)