From 1042d6fee9936a5bb87385921ba771a12a6add7e Mon Sep 17 00:00:00 2001 From: ziy <1936893077@qq.com> Date: Fri, 21 Nov 2025 14:59:28 +0800 Subject: [PATCH 1/2] groovy.xml.* --- .../groovy/com/palantir/javaformat/gradle/XmlUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java index 1a6035c4b..56a2766b0 100644 --- a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java +++ b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import groovy.util.Node; -import groovy.util.XmlNodePrinter; -import groovy.util.XmlParser; +import groovy.xml.XmlNodePrinter; +import groovy.xml.XmlParser; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -47,7 +47,7 @@ public static void updateIdeaXmlFile(File configurationFile, Consumer conf configure.accept(rootNode); try (BufferedWriter writer = Files.newWriter(configurationFile, Charset.defaultCharset()); - PrintWriter printWriter = new PrintWriter(writer)) { + PrintWriter printWriter = new PrintWriter(writer)) { XmlNodePrinter nodePrinter = new XmlNodePrinter(printWriter); nodePrinter.setPreserveWhitespace(true); nodePrinter.print(rootNode); @@ -56,5 +56,6 @@ public static void updateIdeaXmlFile(File configurationFile, Consumer conf } } - private XmlUtils() {} + private XmlUtils() { + } } From 1f28f546841a44955317e98ad7b92c3fd1111fd1 Mon Sep 17 00:00:00 2001 From: ziy <1936893077@qq.com> Date: Fri, 21 Nov 2025 15:40:52 +0800 Subject: [PATCH 2/2] groovy.xml.* --- .../main/groovy/com/palantir/javaformat/gradle/XmlUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java index 56a2766b0..d3ba622cd 100644 --- a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java +++ b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java @@ -47,7 +47,7 @@ public static void updateIdeaXmlFile(File configurationFile, Consumer conf configure.accept(rootNode); try (BufferedWriter writer = Files.newWriter(configurationFile, Charset.defaultCharset()); - PrintWriter printWriter = new PrintWriter(writer)) { + PrintWriter printWriter = new PrintWriter(writer)) { XmlNodePrinter nodePrinter = new XmlNodePrinter(printWriter); nodePrinter.setPreserveWhitespace(true); nodePrinter.print(rootNode); @@ -56,6 +56,5 @@ public static void updateIdeaXmlFile(File configurationFile, Consumer conf } } - private XmlUtils() { - } + private XmlUtils() {} }