Skip to content

Commit

Permalink
Checkstyle with checkstyle 9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dmikurube committed Apr 26, 2024
1 parent 0ca33c7 commit 45f1dc3
Show file tree
Hide file tree
Showing 8 changed files with 680 additions and 425 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 4 additions & 5 deletions config/checkstyle/README.md
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
540 changes: 333 additions & 207 deletions config/checkstyle/checkstyle.xml

Large diffs are not rendered by default.

535 changes: 331 additions & 204 deletions config/checkstyle/google_checks.xml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions embulk-guess-csv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,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
}
6 changes: 3 additions & 3 deletions embulk-guess-csv_all_strings/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down

0 comments on commit 45f1dc3

Please sign in to comment.