Update toolng

neuhalje · Mar 3, 2024 · 365a030 · 365a030
1 parent 4738fb9
commit 365a030
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ javadoc {
 }
 
 checkstyle {
-    toolVersion = "8.1"
+    toolVersion = "8.24"
     showViolations = false
     sourceSets = [project.sourceSets.main]
     // maxWarnings = 0
@@ -44,7 +44,7 @@ tasks.withType(Checkstyle).configureEach {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.11"
     getReportsDirectory().set(file("${buildDir}/jacocoHtml"))
 }
 
@@ -107,6 +107,12 @@ sourceSets {
 configurations {
     integrationTestImplementation.extendsFrom testImplementation
     integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
+    checkstyle {
+        // See https://github.com/gradle/gradle/issues/27035
+        resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+            select("com.google.guava:guava:0")
+        }
+    }
 }
 
 tasks.register('integrationTest', Test) {

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -27,6 +27,10 @@
             <property name="eachLine" value="true"/>
         </module>
 
+    <module name="LineLength">
+        <property name="max" value="100"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -39,10 +43,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="100"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>