Merge pull request #22 from embulk/checkstyle-9.3

Checkstyle with checkstyle 9.3

Author: dmikurube

build.gradle

@@ -215,13 +215,13 @@ tasks.withType(Checkstyle) {
 }
 
 checkstyle {
-    toolVersion "8.7"
+    toolVersion = libs.versions.checkstyle.get()
     configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
     configProperties = [
-        "checkstyle.config.path": file("${projectDir}/config/checkstyle")
+        "org.checkstyle.google.suppressionfilter.config": file("${rootProject.projectDir}/config/checkstyle/checkstyle-suppressions.xml"),
     ]
     ignoreFailures = false
-    maxWarnings = 0  // https://github.com/gradle/gradle/issues/881
+    maxWarnings = 0
 }
 
 // Task ":compileTestJava" somehow uses this output of task ":jar" without declaring an explicit or implicit dependency.

config/checkstyle/README.md

@@ -1,12 +1,11 @@
 Checkstyle for the Embulk project
 ==================================
 
-* google_check.xml: Downloaded from: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-     * Commit: 60f41e3c16e6c94b0bf8c2e5e4b4accf4ad394ab
+* google_check.xml: Downloaded from: https://github.com/checkstyle/checkstyle/blob/checkstyle-9.3/src/main/resources/google_checks.xml
+     * Commit: 5c1903792f8432243cc8ae5cd79a03a004d3c09c
 * checkstyle.xml: Customized from google_check.xml.
-    * To enable suppressions through suppressions.xml.
+    * To enable suppressions through checkstyle-suppressions.xml.
     * To enable suppressions with @SuppressWarnings.
-    * To accept package names with underscores.
     * To indent with 4-column spaces.
-    * To limit columns to 180 characters, which will be shortened later.
+    * To limit columns to 180 characters.
     * To reject unused imports.

config/checkstyle/suppressions.xml config/checkstyle/checkstyle-suppressions.xml

@@ -8,6 +8,7 @@
   <suppress checks="JavadocMethod" files=".*"/>
   <suppress checks="JavadocParagraph" files=".*"/>
   <suppress checks="JavadocTagContinuationIndentation" files=".*"/>
+  <suppress checks="MissingJavadocType" files=".*"/>
   <suppress checks="SingleLineJavadoc" files=".*"/>
   <suppress checks="SummaryJavadoc" files=".*"/>
 </suppressions>

config/checkstyle/checkstyle.xml

@@ -185,11 +185,11 @@ tasks.withType(Checkstyle) {
 }
 
 checkstyle {
-    toolVersion "8.7"
+    toolVersion = libs.versions.checkstyle.get()
     configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
     configProperties = [
-        "checkstyle.config.path": file("${rootProject.projectDir}/config/checkstyle")
+        "org.checkstyle.google.suppressionfilter.config": file("${rootProject.projectDir}/config/checkstyle/checkstyle-suppressions.xml"),
     ]
     ignoreFailures = false
-    maxWarnings = 0  // https://github.com/gradle/gradle/issues/881
+    maxWarnings = 0
 }

config/checkstyle/google_checks.xml

@@ -186,11 +186,11 @@ tasks.withType(Checkstyle) {
 }
 
 checkstyle {
-    toolVersion "8.7"
+    toolVersion = libs.versions.checkstyle.get()
     configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
     configProperties = [
-        "checkstyle.config.path": file("${rootProject.projectDir}/config/checkstyle")
+        "org.checkstyle.google.suppressionfilter.config": file("${rootProject.projectDir}/config/checkstyle/checkstyle-suppressions.xml"),
     ]
     ignoreFailures = false
-    maxWarnings = 0  // https://github.com/gradle/gradle/issues/881
+    maxWarnings = 0
 }

embulk-guess-csv/build.gradle

@@ -34,6 +34,8 @@ embulk-guess-csv = "0.10.42"
 embulk-guess-gzip = "0.10.42"
 embulk-guess-json = "0.10.42"
 
+checkstyle = "9.3"
+
 [libraries]
 
 embulk-spi = { group = "org.embulk", name = "embulk-spi", version.ref = "embulk-spi" }