Skip to content

Commit 7e00bd9

Browse files
AustinShalitAustinShalit
committed
Update checkstyle so CI will build
1 parent 905e882 commit 7e00bd9

File tree

2 files changed

+34
-31
lines changed

2 files changed

+34
-31
lines changed

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ project(":core") {
8787
apply plugin: 'java'
8888
apply plugin: 'idea'
8989
apply plugin: 'jacoco'
90+
apply plugin: 'checkstyle'
9091
apply plugin: "com.github.johnrengelman.shadow"
9192

9293
configurations {
@@ -193,6 +194,7 @@ project(":ui") {
193194
apply plugin: 'java'
194195
apply plugin: 'idea'
195196
apply plugin: 'jacoco'
197+
apply plugin: 'checkstyle'
196198
apply plugin: 'application'
197199
apply from: 'http://dl.bintray.com/shemnon/javafx-gradle/8.1.1/javafx.plugin'
198200

‎google_checks.xml‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
3+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
55

66
<!--
7-
Checkstyle configuration that checks the Google coding conventions from Google Java Style
8-
that can be found at https://google.github.io/styleguide/javaguide.html.
7+
8+
Checkstyle configuration that checks the Google coding conventions from:
9+
10+
- Google Java Style
11+
https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html
912
1013
Checkstyle is very configurable. Be sure to read the documentation at
1114
http://checkstyle.sf.net (or in your downloaded distribution).
1215
16+
Most Checks are configurable, be sure to consult the documentation.
17+
1318
To completely disable a check, just comment it out or delete it from the file.
1419
1520
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
21+
1622
-->
1723

1824
<module name = "Checker">
@@ -23,9 +29,9 @@
2329
<property name="fileExtensions" value="java, properties, xml"/>
2430
<!-- Checks for whitespace -->
2531
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
26-
<module name="FileTabCharacter">
27-
<property name="eachLine" value="true"/>
28-
</module>
32+
<module name="FileTabCharacter">
33+
<property name="eachLine" value="true"/>
34+
</module>
2935

3036
<module name="TreeWalker">
3137
<module name="OuterTypeFilename"/>
@@ -65,9 +71,9 @@
6571
<property name="allowEmptyTypes" value="true"/>
6672
<property name="allowEmptyLoops" value="true"/>
6773
<message key="ws.notFollowed"
68-
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
69-
<message key="ws.notPreceded"
70-
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
74+
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
75+
<message key="ws.notPreceded"
76+
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
7177
</module>
7278
<module name="OneStatementPerLine"/>
7379
<module name="MultipleVariableDeclarations"/>
@@ -91,54 +97,49 @@
9197
<module name="PackageName">
9298
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
9399
<message key="name.invalidPattern"
94-
value="Package name ''{0}'' must match pattern ''{1}''."/>
100+
value="Package name ''{0}'' must match pattern ''{1}''."/>
95101
</module>
96102
<module name="TypeName">
97103
<message key="name.invalidPattern"
98-
value="Type name ''{0}'' must match pattern ''{1}''."/>
104+
value="Type name ''{0}'' must match pattern ''{1}''."/>
99105
</module>
100106
<module name="MemberName">
101107
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
102108
<message key="name.invalidPattern"
103-
value="Member name ''{0}'' must match pattern ''{1}''."/>
109+
value="Member name ''{0}'' must match pattern ''{1}''."/>
104110
</module>
105111
<module name="ParameterName">
106112
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
107113
<message key="name.invalidPattern"
108-
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
109-
</module>
110-
<module name="CatchParameterName">
111-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
112-
<message key="name.invalidPattern"
113-
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
114+
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
114115
</module>
115116
<module name="LocalVariableName">
116117
<property name="tokens" value="VARIABLE_DEF"/>
117118
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
118119
<property name="allowOneCharVarInForLoop" value="true"/>
119120
<message key="name.invalidPattern"
120-
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
121+
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
121122
</module>
122123
<module name="ClassTypeParameterName">
123124
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
124125
<message key="name.invalidPattern"
125-
value="Class type name ''{0}'' must match pattern ''{1}''."/>
126+
value="Class type name ''{0}'' must match pattern ''{1}''."/>
126127
</module>
127128
<module name="MethodTypeParameterName">
128129
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
129130
<message key="name.invalidPattern"
130-
value="Method type name ''{0}'' must match pattern ''{1}''."/>
131+
value="Method type name ''{0}'' must match pattern ''{1}''."/>
131132
</module>
132133
<module name="NoFinalizer"/>
133134
<module name="GenericWhitespace">
134135
<message key="ws.followed"
135-
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
136-
<message key="ws.preceded"
137-
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
138-
<message key="ws.illegalFollow"
139-
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
140-
<message key="ws.notPreceded"
141-
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
136+
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
137+
<message key="ws.preceded"
138+
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
139+
<message key="ws.illegalFollow"
140+
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
141+
<message key="ws.notPreceded"
142+
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
142143
</module>
143144
<module name="Indentation">
144145
<property name="basicOffset" value="4"/>
@@ -174,7 +175,7 @@
174175
</module>
175176
<module name="NonEmptyAtclauseDescription"/>
176177
<module name="JavadocTagContinuationIndentation"/>
177-
<module name="SummaryJavadoc">
178+
<module name="SummaryJavadocCheck">
178179
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
179180
</module>
180181
<module name="JavadocParagraph"/>
@@ -194,7 +195,7 @@
194195
<module name="MethodName">
195196
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
196197
<message key="name.invalidPattern"
197-
value="Method name ''{0}'' must match pattern ''{1}''."/>
198+
value="Method name ''{0}'' must match pattern ''{1}''."/>
198199
</module>
199200
<module name="SingleLineJavadoc">
200201
<property name="ignoreInlineTags" value="false"/>

0 commit comments

Comments
 (0)