Skip to content

Commit f949033

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

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

Lines changed: 9 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;
@@ -45,16 +46,20 @@ public void apply(Project project) {
4546
java.targetExclude("build/**");
4647
java.palantirJavaFormat();
4748
java.licenseHeader("// SPDX-License-Identifier: Apache-2.0\n", "package|import");
49+
java.setLineEndings(LineEnding.UNIX);
4850
});
51+
// separate 'package-info' formatting due to https://github.com/diffplug/spotless/issues/532
4952
spotless.format("javaPackageInfoFiles", java -> {
50-
java.targetExclude("build/**");
51-
// add a separate extension due to https://github.com/diffplug/spotless/issues/532
53+
java.targetExclude("build");
5254
java.target("src/**/package-info.java");
53-
5455
java.licenseHeader("// SPDX-License-Identifier: Apache-2.0\n", "package|import|@");
56+
java.setLineEndings(LineEnding.UNIX);
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));
62+
gradle.setLineEndings(LineEnding.UNIX);
63+
});
5964
}
6065
}

0 commit comments

Comments
 (0)