Excavator: Upgrades Baseline to the latest version

palantir · Feb 1, 2023 · 14bd518 · 14bd518
1 parent fdc464f
commit 14bd518
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -43,7 +43,7 @@
     </module>
     <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
         <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
     </module>
     <module name="TreeWalker">
         <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->

diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
@@ -44,8 +44,10 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <!-- Should be a superset of https://github.com/google/error-prone/blob/c481b3f9c2da112db36ccfcbf64e755261a127ab/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java#L63 -->
           <DO_NOT_IMPORT_INNER>
             <CLASS name="Builder" />
+            <CLASS name="BuilderFactory" />
             <CLASS name="Callback" />
             <CLASS name="Class" />
             <CLASS name="Entry" />
@@ -54,6 +56,7 @@
             <CLASS name="Type" />
             <CLASS name="Key" />
             <CLASS name="Id" />
+            <CLASS name="Identifier" />
             <CLASS name="Provider" />
           </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.28.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.1.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.188.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.33.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'

diff --git a/...ric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java b/...ric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java
@@ -137,7 +137,7 @@ public final void createManifest() throws IOException {
                 ImmutableMap.builder()
                         .putAll(getLocalMetrics())
                         .putAll(getDiscoveredMetrics())
-                        .build());
+                        .buildOrThrow());
     }
 
     private Map<String, List<MetricSchema>> getLocalMetrics() {
@@ -167,7 +167,7 @@ private Map<String, List<MetricSchema>> getDiscoveredMetrics() {
             }
         });
 
-        return discoveredMetrics.build();
+        return discoveredMetrics.buildOrThrow();
     }
 
     private static Optional<List<MetricSchema>> inferProjectDependencyMetrics(Project dependencyProject) {