Skip to content

Commit fd6345e

Browse files
committed
Explicitly set line endings to avoid using git at configuration time
1 parent 9d26b6b commit fd6345e

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ plugins {
77
version = "0.7"
88

99
dependencies {
10-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")
10+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0") {
11+
// Exclude transitive dependencies of JGit as we do not need git functionality.
12+
// We can't exclude JGit itself as types are referenced in SpotlessTask.class.
13+
exclude("com.googlecode.javaewah", "JavaEWAH")
14+
exclude("commons-codec", "commons-codec")
15+
exclude("org.slf4j", "slf4j-api")
16+
}
1117
implementation("com.gradle.publish:plugin-publish-plugin:2.0.0")
1218
implementation("com.gradle:common-custom-user-data-gradle-plugin:2.4.0")
1319
implementation("com.gradle:develocity-gradle-plugin:4.2.2")

src/main/java/org/gradlex/conventions/check/SpotlessConventionsPlugin.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.diffplug.gradle.spotless.SpotlessExtension;
2020
import com.diffplug.gradle.spotless.SpotlessPlugin;
21+
import com.diffplug.spotless.LineEnding;
2122
import org.gradle.api.Plugin;
2223
import org.gradle.api.Project;
2324
import org.gradlex.conventions.base.LifecycleConventionsPlugin;
@@ -40,21 +41,23 @@ public void apply(Project project) {
4041
tasks.named("qualityCheck", task -> task.dependsOn(tasks.named("spotlessCheck")));
4142
tasks.named("qualityGate", task -> task.dependsOn(tasks.named("spotlessApply")));
4243

44+
spotless.setLineEndings(LineEnding.UNIX);
45+
4346
// format the source code
4447
spotless.java(java -> {
4548
java.targetExclude("build/**");
4649
java.palantirJavaFormat();
4750
java.licenseHeader("// SPDX-License-Identifier: Apache-2.0\n", "package|import");
4851
});
52+
// separate 'package-info' formatting due to https://github.com/diffplug/spotless/issues/532
4953
spotless.format("javaPackageInfoFiles", java -> {
50-
java.targetExclude("build/**");
51-
// add a separate extension due to https://github.com/diffplug/spotless/issues/532
54+
java.targetExclude("build");
5255
java.target("src/**/package-info.java");
53-
5456
java.licenseHeader("// SPDX-License-Identifier: Apache-2.0\n", "package|import|@");
5557
});
5658

5759
// format the build itself
58-
spotless.kotlinGradle(gradle -> gradle.ktfmt().kotlinlangStyle().configure(conf -> conf.setMaxWidth(120)));
60+
spotless.kotlinGradle(gradle ->
61+
gradle.ktfmt().kotlinlangStyle().configure(conf -> conf.setMaxWidth(120)));
5962
}
6063
}

0 commit comments

Comments
 (0)