diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 1a086c49c..fd1fa3897 100644 --- 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 --> @@ -402,7 +402,9 @@ <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> </module> - <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity --> + <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity --> + <property name="switchBlockAsSingleDecisionPoint" value="true"/> + </module> <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension --> <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/> </module> diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml index f41e2b8aa..6a5f83a61 100644 --- 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 index 321d5ab08..ff7b35b23 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0' classpath 'com.gradle.publish:plugin-publish-plugin:1.2.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.145.0' + classpath 'com.palantir.baseline:gradle-baseline-java:5.7.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0' classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'