Skip to content

Commit e2f30d0

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent 7857fff commit e2f30d0

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
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>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66

77
dependencies {
88
classpath 'com.gradle.publish:plugin-publish-plugin:1.0.0'
9-
classpath 'com.palantir.baseline:gradle-baseline-java:4.145.0'
9+
classpath 'com.palantir.baseline:gradle-baseline-java:4.181.0'
1010
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
1111
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
1212
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'

idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirCodeStyleManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static Map<TextRange, String> getReplacements(
8585
formatter.getFormatReplacements(text, toRanges(ranges)).forEach(replacement -> {
8686
replacements.put(toTextRange(replacement.getReplaceRange()), replacement.getReplacementString());
8787
});
88-
return replacements.build();
88+
return replacements.buildOrThrow();
8989
} catch (FormatterException e) {
9090
log.debug("Formatter failed, no replacements", e);
9191
return ImmutableMap.of();

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private static ImmutableMap<Integer, Integer> makePositionToColumnMap(List<Tok>
307307
for (Tok tok : toks) {
308308
builder.put(tok.getPosition(), tok.getColumn());
309309
}
310-
return builder.build();
310+
return builder.buildOrThrow();
311311
}
312312

313313
/**

0 commit comments

Comments
 (0)