Skip to content

Commit 681daaf

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent fc3dccb commit 681daaf

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</module>
4444
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
4545
<property name="max" value="120"/>
46-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
46+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|\{@link"/>
4747
</module>
4848
<module name="TreeWalker">
4949
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
@@ -402,7 +402,9 @@
402402
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
403403
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
404404
</module>
405-
<module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
405+
<module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
406+
<property name="switchBlockAsSingleDecisionPoint" value="true"/>
407+
</module>
406408
<module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
407409
<property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
408410
</module>

.baseline/idea/intellij-java-palantir-style.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@
4444
<package name="" withSubpackages="true" static="false" />
4545
</value>
4646
</option>
47+
<!-- Should be a superset of https://github.com/google/error-prone/blob/c481b3f9c2da112db36ccfcbf64e755261a127ab/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java#L63 -->
4748
<DO_NOT_IMPORT_INNER>
4849
<CLASS name="Builder" />
50+
<CLASS name="BuilderFactory" />
4951
<CLASS name="Callback" />
5052
<CLASS name="Class" />
5153
<CLASS name="Entry" />
@@ -54,6 +56,7 @@
5456
<CLASS name="Type" />
5557
<CLASS name="Key" />
5658
<CLASS name="Id" />
59+
<CLASS name="Identifier" />
5760
<CLASS name="Provider" />
5861
</DO_NOT_IMPORT_INNER>
5962
</GroovyCodeStyleSettings>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
dependencies {
88
classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0'
99
classpath 'com.gradle.publish:plugin-publish-plugin:1.2.0'
10-
classpath 'com.palantir.baseline:gradle-baseline-java:4.145.0'
10+
classpath 'com.palantir.baseline:gradle-baseline-java:5.6.0'
1111
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0'
1212
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
1313
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'

0 commit comments

Comments
 (0)