Skip to content

Commit 56e624d

Browse files
committed
Update Checkstyle to 13.5.0 and update other plugins
1 parent 03dea10 commit 56e624d

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

config/checkstyle/checkstyle.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
6666
</module>
6767
<module name="SuppressWithPlainTextCommentFilter">
68-
<property name="checkFormat" value="IndentationCheck"/>
68+
<property name="checkFormat" value="\.IndentationCheck$"/>
6969
<property name="offCommentFormat" value='^""".?'/>
7070
<property name="onCommentFormat" value='.'/>
7171
</module>
@@ -137,8 +137,8 @@
137137
<property name="tokens"
138138
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
139139
INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
140-
COMPACT_CTOR_DEF, LITERAL_SWITCH, LITERAL_CASE, LITERAL_FINALLY,
141-
LITERAL_CATCH"/>
140+
COMPACT_CTOR_DEF, LITERAL_SWITCH, LITERAL_CASE, LITERAL_DEFAULT,
141+
LITERAL_FINALLY, LITERAL_CATCH"/>
142142
</module>
143143
<module name="SuppressionXpathSingleFilter">
144144
<!-- suppression is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
@@ -371,12 +371,18 @@
371371
RECORD_DEF, RECORD_PATTERN_DEF"/>
372372
</module>
373373
<module name="OperatorWrap">
374+
<property name="id" value="OperatorWrapNL"/>
374375
<property name="option" value="NL"/>
375376
<property name="tokens"
376377
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
377378
LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
378379
TYPE_EXTENSION_AND "/>
379380
</module>
381+
<module name="OperatorWrap">
382+
<property name="id" value="OperatorWrapEOL"/>
383+
<property name="option" value="EOL"/>
384+
<property name="tokens" value="LAMBDA"/>
385+
</module>
380386
<module name="AnnotationLocation">
381387
<property name="id" value="AnnotationLocationTypeAndPackage"/>
382388
<property name="tokens"
@@ -454,10 +460,17 @@
454460
</module>
455461
<module name="SingleLineJavadoc"/>
456462
<module name="TodoComment">
463+
<property name="id" value="TodoFormat"/>
457464
<property name="format" value="^[ \t]*(?!TODO:)(?i:TODO)\b:?"/>
458465
<message key="todo.match"
459466
value="''TODO:'' must be written in all caps and followed by a colon."/>
460467
</module>
468+
<module name="TodoComment">
469+
<property name="id" value="BoxComments"/>
470+
<property name="format" value="^[ \t]*([*=#])\1{8,}[ \t]*$"/>
471+
<message key="todo.match"
472+
value="Comment uses box-like repetitive character pattern."/>
473+
</module>
461474
<module name="EmptyCatchBlock">
462475
<property name="commentFormat" value="\w+"/>
463476
</module>

gradle/libs.versions.toml

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

6666
# Gradle Plugins
67-
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "13.4.1" }
67+
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "13.5.0" }
6868
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "9.5.0" }
69-
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.4.1" }
70-
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.4.0" }
69+
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.4.2" }
70+
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.6.0" }

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ plugins {
3636
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
3737
/* Loom and ModDevGradle get applied here, because
3838
otherwise they will fail to add repositories properly. */
39-
id("net.fabricmc.fabric-loom-repositories") version "1.16-SNAPSHOT" // https://github.com/FabricMC/fabric-loom
39+
id("net.fabricmc.fabric-loom-repositories") version "1.16.2" // https://github.com/FabricMC/fabric-loom
4040
id("net.neoforged.moddev.repositories") version "2.0.141" // https://projects.neoforged.net/neoforged/ModDevGradle
4141
}
4242

0 commit comments

Comments
 (0)