Skip to content

Commit edaa89e

Browse files
authored
Merge branch 'dev' into update-dependencies
2 parents 40f1e0d + ed24794 commit edaa89e

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

se-commons-codestyle/src/main/java/de/se_rwth/codestyle/SECodeStylePlugin.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,24 @@ public void apply(@Nonnull Project project) {
6363

6464
// Configure spotless
6565
SpotlessExtension spotless = project.getExtensions().getByType(SpotlessExtension.class);
66-
spotless.java(extension -> {
67-
extension.targetExclude("build/**", "target/**");
68-
69-
// trim trailing whitespace before doing the Eclipse formatting
70-
extension.trimTrailingWhitespace();
71-
72-
// Eclipse formatting
73-
extension.eclipse().configFile(codeStyleFile);
74-
75-
extension.licenseHeader("/* (c) https://github.com/MontiCore/monticore */");
76-
extension.endWithNewline();
77-
extension.toggleOffOn("@formatter:off", "@formatter:on");
78-
extension.removeUnusedImports();
79-
extension.indentWithSpaces(2);
66+
project.getPlugins().withId("java",javaPlugin -> {
67+
// Only configure java if the java-plugin is applied
68+
spotless.java(extension -> {
69+
// exclude generated sources by default
70+
extension.targetExclude("build/**", "target/**");
71+
72+
// trim trailing whitespace before doing the Eclipse formatting
73+
extension.trimTrailingWhitespace();
74+
75+
// Eclipse formatting
76+
extension.eclipse().configFile(codeStyleFile);
77+
78+
extension.licenseHeader("/* (c) https://github.com/MontiCore/monticore */");
79+
extension.endWithNewline();
80+
extension.toggleOffOn("@formatter:off", "@formatter:on");
81+
extension.removeUnusedImports();
82+
extension.indentWithSpaces(2);
83+
});
8084
});
8185

8286
spotless.format("markdown", extension -> {

0 commit comments

Comments
 (0)