diff --git a/changelog/@unreleased/pr-1278.v2.yml b/changelog/@unreleased/pr-1278.v2.yml new file mode 100644 index 000000000..77dbdbbe2 --- /dev/null +++ b/changelog/@unreleased/pr-1278.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Disable `LeftCurly` CheckStyle rule when Palantir-Java-Format is applied + links: + - https://github.com/palantir/gradle-baseline/pull/1278 diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineConfig.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineConfig.java index be48a8cbd..c598d15fb 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineConfig.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineConfig.java @@ -107,6 +107,10 @@ public void execute(Task task) { .replace( " \n", + "") + .replace( + " " + + "\n", ""); Preconditions.checkState(!contents.equals(replaced), "Patching checkstyle.xml must make a change"); Files.write(checkstyleXml, replaced.getBytes(StandardCharsets.UTF_8));