Skip to content

Commit

Permalink
Excavator: Upgrades Baseline to the latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-excavator-bot committed Sep 21, 2023
1 parent 8d23ee9 commit 8556cea
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions .baseline/idea/intellij-java-palantir-style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -54,6 +56,7 @@
<CLASS name="Type" />
<CLASS name="Key" />
<CLASS name="Id" />
<CLASS name="Identifier" />
<CLASS name="Provider" />
</DO_NOT_IMPORT_INNER>
</GroovyCodeStyleSettings>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.11.0'
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.38.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.59.0'
classpath 'com.palantir.baseline:gradle-baseline-java:5.21.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.15.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ default Optional<List<Map<String, String>>> bearer() {
.put("key", "token")
.put("value", AUTH_VARIABLE)
.put("type", "string")
.build()));
.buildOrThrow()));
}

static Builder builder() {
Expand Down
2 changes: 0 additions & 2 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,4 @@ org.assertj:* = 3.23.1
org.hamcrest:hamcrest-core = 2.2
org.immutables:* = 2.8.8
org.javassist:javassist = 3.22.0-GA
org.mockito:mockito-core = 4.8.0
org.slf4j:* = 1.7.36
org.objenesis:objenesis = 3.3

0 comments on commit 8556cea

Please sign in to comment.