Excavator: Upgrades Baseline to the latest version (#920)

palantir · Jan 9, 2024 · b8760f6 · b8760f6
1 parent 2310e05
commit b8760f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
@@ -58,6 +58,7 @@
             <CLASS name="Id" />
             <CLASS name="Identifier" />
             <CLASS name="Provider" />
+            <CLASS name="Visitor" />
           </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>
         <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.2.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:5.20.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.35.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.17.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'

diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/FormatDiff.java
@@ -28,7 +28,6 @@
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.Streams;
 import com.google.common.collect.TreeRangeSet;
-import com.google.common.io.ByteStreams;
 import com.palantir.javaformat.java.FormatterException;
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.Replacement;
@@ -138,7 +137,7 @@ private static String gitCommand(Path dir, String... args) throws IOException, I
         Preconditions.checkState(process.exitValue() == 0, "Expected return code of 0");
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ByteStreams.copy(process.getInputStream(), baos);
+        process.getInputStream().transferTo(baos);
         return new String(baos.toByteArray(), UTF_8).trim();
     }
 

diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java
@@ -78,6 +78,7 @@ public PalantirCodeStyleManager(@NotNull Project project) {
         this.project = original.getProject();
     }
 
+    @SuppressWarnings("ImmutableMapDuplicateKeyStrategy")
     static Map<TextRange, String> getReplacements(
             FormatterService formatter, String text, Collection<? extends TextRange> ranges) {
         try {