Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<!--
In order to be compatible with CodeClimate, we have to stay in sync with the version of Checkstyle that they are using.
This is currently: 8.39. Check the links below to get up-to-date version information.
It doesn't seem to be updated much by default, but we can specify a channel, which is currently using 10.7.0.
Check the links below to get up-to-date version information.
https://github.com/codeclimate/codeclimate-checkstyle/branches/all (channel/ branches)
https://docs.codeclimate.com/docs/checkstyle
https://github.com/codeclimate/codeclimate-checkstyle/blob/master/bin/install-checkstyle.sh
-->

<module name="Checker">
<property name="charset" value="UTF-8" />
<property name="severity" value="warning" />
<property name="fileExtensions" value="java, properties, xml" />
<property name="fileExtensions" value="java" />

<module name="SuppressWarningsFilter" />

Expand Down Expand Up @@ -113,7 +115,7 @@
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
<module name="UnnecessarySemicolonInEnumeration" />
<module name="UnnecessarySemicolonInTryWithResources" />
<!-- Checkstyle 9.3: <module name="UnusedLocalVariable" /> -->
<module name="UnusedLocalVariable" />
<module name="VariableDeclarationUsageDistance" />

<!-- Headers -->
Expand All @@ -132,7 +134,7 @@
<module name="JavadocBlockTagLocation" />
<module name="JavadocContentLocation" />
<module name="JavadocMethod">
<property name="scope" value="package" />
<property name="accessModifiers" value="package" />
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF" />
</module>
<module name="JavadocMissingLeadingAsterisk" />
Expand Down Expand Up @@ -232,7 +234,7 @@
<!-- Override to exclude ELLIPSIS and to add METHOD_REF -->
<property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, LABELED_STAT, METHOD_REF" />
</module>
<!-- Checkstyle 8.45: <module name="NoWhitespaceBeforeCaseDefaultColon" /> -->
<module name="NoWhitespaceBeforeCaseDefaultColon" />
<module name="OperatorWrap" />
<module name="ParenPad" />
<module name="SeparatorWrap">
Expand Down
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ version: '2' # required to adjust maintainability checks
plugins:
checkstyle:
enabled: true
channel: 'checkstyle-10-7-0'
config:
file: '.checkstyle.xml'
sonar-java:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.idea/
.idea/*
!.idea/vcs.xml
!.idea/checkstyle-idea.xml
*.iml
*.class
target/
19 changes: 19 additions & 0 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.