Skip to content

Commit b79d470

Browse files
Update checkstyle (exercism#2260)
1 parent 6458b68 commit b79d470

2 files changed

Lines changed: 23 additions & 25 deletions

File tree

exercises/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ subprojects {
6262

6363
// configuration of the linter
6464
checkstyle {
65-
toolVersion '7.8.1'
65+
toolVersion '10.7.0'
6666
configFile file("checkstyle.xml")
6767
sourceSets = [project.sourceSets.main, project.sourceSets.test]
6868
}

exercises/checkstyle.xml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@ page at http://checkstyle.sourceforge.net/config.html -->
1010

1111
<module name="Checker">
1212

13+
<module name="LineLength">
14+
<!-- Checks if a line is too long. -->
15+
<property name="max" value="120" default="120" />
16+
<property name="severity" value="error" />
17+
18+
<!--
19+
The default ignore pattern exempts the following elements:
20+
- import statements
21+
- long URLs inside comments
22+
-->
23+
24+
<property name="ignorePattern" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
25+
default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$" />
26+
</module>
27+
1328
<module name="FileTabCharacter">
1429
<property name="severity" value="error" />
1530
<!-- Checks that there are no tab characters in the file.
@@ -42,9 +57,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
4257
<!-- All Java AST specific tests live under TreeWalker module. -->
4358
<module name="TreeWalker">
4459

45-
<!-- required for SupressionCommentFilter and SuppressWithNearbyCommentFilter -->
46-
<module name="FileContentsHolder" />
47-
4860
<!-- check for indentation with 4 spaces -->
4961
<module name="Indentation" />
5062

@@ -172,21 +184,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
172184
173185
-->
174186

175-
<module name="LineLength">
176-
<!-- Checks if a line is too long. -->
177-
<property name="max" value="120" default="120" />
178-
<property name="severity" value="error" />
179-
180-
<!--
181-
The default ignore pattern exempts the following elements:
182-
- import statements
183-
- long URLs inside comments
184-
-->
185-
186-
<property name="ignorePattern" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
187-
default="^(package .*;\s*)|(import .*;\s*)|( *\* *https?://.*)$" />
188-
</module>
189-
190187
<module name="LeftCurly">
191188
<!-- Checks for placement of the left curly brace ('{'). -->
192189
<property name="severity" value="error" />
@@ -310,12 +307,13 @@ page at http://checkstyle.sourceforge.net/config.html -->
310307
<property name="severity" value="error" />
311308
</module>
312309

313-
</module>
310+
<module name="SuppressionCommentFilter">
311+
<property name="offCommentFormat" value="CHECKSTYLE OFF: (.+)" />
312+
<property name="onCommentFormat" value="CHECKSTYLE ON" />
313+
<property name="checkFormat" value="Javadoc.*" />
314+
<property name="messageFormat" value="$1" />
315+
</module>
314316

315-
<module name="SuppressionCommentFilter">
316-
<property name="offCommentFormat" value="CHECKSTYLE OFF: (.+)" />
317-
<property name="onCommentFormat" value="CHECKSTYLE ON" />
318-
<property name="checkFormat" value="Javadoc.*" />
319-
<property name="messageFormat" value="$1" />
320317
</module>
318+
321319
</module>

0 commit comments

Comments
 (0)