Skip to content

Commit cdee081

Browse files
committed
Update Gradle to 9.3.1, update checkstyle and other plugins
1 parent 66323d6 commit cdee081

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

config/checkstyle/checkstyle.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<module name="IllegalTokenText">
7878
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL, TEXT_BLOCK_CONTENT"/>
7979
<property name="format"
80-
value="\\u00(09|0(a|A)|0(b|B)|(0|1)(c|C)|(0|1)(d|D)|1(d|D)|1(e|E)|1(f|F)|22|27|5(C|c))|\\u1680|\\u3000|\\u20(00|0(a|A)|28|29|(2|5)(f|F))|\\(0(10|11|12|14|15|40|42|47)|134)"/>
80+
value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|20|22|27|5(C|c))|\\(0(10|11|12|14|15|40|42|47)|134)"/>
8181
<property name="message"
8282
value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
8383
</module>
@@ -147,10 +147,7 @@
147147
</module>
148148
<module name="WhitespaceAfter">
149149
<property name="tokens"
150-
value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
151-
LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
152-
LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
153-
LITERAL_YIELD, LITERAL_CASE, LITERAL_WHEN, ANNOTATIONS"/>
150+
value="COMMA, SEMI, TYPECAST, ELLIPSIS, LITERAL_YIELD, LITERAL_CASE, ANNOTATIONS"/>
154151
</module>
155152
<module name="WhitespaceAround">
156153
<property name="allowEmptyConstructors" value="true"/>
@@ -196,10 +193,13 @@
196193
<module name="MultipleVariableDeclarations"/>
197194
<module name="ArrayTypeStyle"/>
198195
<module name="JavadocLeadingAsteriskAlign"/>
196+
<module name="JavadocMissingLeadingAsterisk"/>
197+
<module name="JavadocContentLocation"/>
199198
<module name="MissingSwitchDefault"/>
200199
<module name="FallThrough"/>
201200
<module name="UpperEll"/>
202201
<module name="ModifierOrder"/>
202+
<module name="TextBlockGoogleStyleFormatting"/>
203203
<module name="EmptyLineSeparator">
204204
<property name="tokens"
205205
value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
@@ -264,22 +264,22 @@
264264
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
265265
</module>
266266
<module name="LambdaParameterName">
267-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
267+
<property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
268268
<message key="name.invalidPattern"
269269
value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
270270
</module>
271271
<module name="CatchParameterName">
272-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
272+
<property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
273273
<message key="name.invalidPattern"
274274
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
275275
</module>
276276
<module name="LocalVariableName">
277-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
277+
<property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
278278
<message key="name.invalidPattern"
279279
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
280280
</module>
281281
<module name="PatternVariableName">
282-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
282+
<property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
283283
<message key="name.invalidPattern"
284284
value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
285285
</module>
@@ -389,12 +389,13 @@
389389
<property name="tokens" value="VARIABLE_DEF"/>
390390
<property name="allowSamelineMultipleAnnotations" value="true"/>
391391
</module>
392+
<module name="MissingOverrideOnRecordAccessor"/>
392393
<module name="NonEmptyAtclauseDescription"/>
393394
<module name="InvalidJavadocPosition"/>
394395
<module name="JavadocTagContinuationIndentation"/>
395396
<module name="SummaryJavadoc">
396397
<property name="forbiddenSummaryFragments"
397-
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
398+
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )|^[a-z]"/>
398399
</module>
399400
<module name="JavadocParagraph">
400401
<property name="allowNewlineParagraph" value="false"/>

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "pap
5353
velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity-api" }
5454

5555
# Gradle Plugins
56-
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "12.1.2" }
57-
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "9.0.0" }
58-
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.2.2" }
59-
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.0.0" }
56+
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "13.1.0" }
57+
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "9.2.0" }
58+
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.3.1" }
59+
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.2.1" }

gradle/wrapper/gradle-wrapper.jar

542 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)