Skip to content

Commit

Permalink
Upgrade deps (#605)
Browse files Browse the repository at this point in the history
Upgrades Gradle to 7.5.1, spotbugs-gradle-plugin to 5.0.9, spotbugs to 4.7.1, checkstyle to 10.3.2, jlink to 2.25.0, jackson to 2.13.3, jupiter to 5.9.0, and javafx to 18. Also fixes `unchecked` Java compiler warning and issue where copyright was being inserted in non-source files.
  • Loading branch information
HEdingfield authored Aug 8, 2022
1 parent 88afa60 commit b08177a
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 17 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
plugins {
id "application"
id "checkstyle"
id "com.github.spotbugs" version "5.0.6"
// Latest version at: https://github.com/spotbugs/spotbugs-gradle-plugin/tags
id "com.github.spotbugs" version "5.0.9"
id "idea"
id "java-library"
id "org.beryx.jlink" version "2.20.0"
id "org.beryx.jlink" version "2.25.0"
id "org.openjfx.javafxplugin" version "0.0.11"
}

Expand All @@ -15,12 +16,12 @@ repositories {
dependencies {
implementation 'org.apache.commons:commons-csv:1.9.0'
implementation 'org.apache.poi:poi-ooxml:5.2.2'
implementation 'com.fasterxml.jackson.core:jackson-core:2.13.2'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
implementation 'com.fasterxml.jackson.core:jackson-core:2.13.3'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
}

// ### Application plugin settings
Expand All @@ -36,10 +37,13 @@ application {

// ### Checkstyle plugin settings
checkstyle {
toolVersion = '10.2'
// Latest version at https://github.com/checkstyle/checkstyle/tags
toolVersion = '10.3.2'
// Keep the below file updated along with subsequent versions of Checkstyle (make sure to choose
// the tag matching the toolVersion above):
// https://github.com/checkstyle/checkstyle/blob/checkstyle-10.2/src/main/resources/google_checks.xml
// https://github.com/checkstyle/checkstyle/blob/checkstyle-10.3.2/src/main/resources/google_checks.xml
// NOTE: It may also be necessary to change "${org.checkstyle.google.suppressionfilter.config}"
// to "${config_loc}/checkstyle-suppressions.xml" or else the suppressions might be ignored
configFile = file("$projectDir/config/checkstyle/google_checks.xml")
maxWarnings = 0
ignoreFailures = false
Expand All @@ -48,7 +52,8 @@ System.setProperty("org.checkstyle.google.suppressionfilter.config",
"$projectDir/config/checkstyle/checkstyle-suppressions.xml")

spotbugs {
toolVersion = '4.6.0'
// Latest version at: https://github.com/spotbugs/spotbugs/tags
toolVersion = '4.7.1'
excludeFilter = file("config/spotbugs/exclude.xml")
}

Expand Down Expand Up @@ -80,7 +85,7 @@ test {

// ### JavaFX plugin settings
javafx {
version = "17"
version = "18"
modules = ["javafx.base", "javafx.controls", "javafx.fxml", "javafx.graphics"]
}

Expand Down
4 changes: 2 additions & 2 deletions config/checkstyle/checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<suppressions>
<!-- If we don't name our fields in ways the violate the below checks, the code doesn't function -->
<!-- If we don't name our fields in ways that violate the below checks, the code doesn't function -->
<suppress checks="MemberName" files="CommonDataFormatReader.java|HartCvrReader.java"/>
<suppress checks="AbbreviationAsWordInNameCheck" files="CommonDataFormatReader.java"
message="CVR"/>
Expand All @@ -15,4 +15,4 @@
<suppress checks="AbbreviationAsWordInNameCheck" files="ContestConfig.java"
message="isMultiSeatBottomsUpUntilNWinnersEnabled"/>

</suppressions>
</suppressions>
Loading

0 comments on commit b08177a

Please sign in to comment.