Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade deps #605

Merged
merged 5 commits into from
Aug 8, 2022
Merged

Upgrade deps #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fdf0a2
Upgrades Gradle to 7.5.1, spotbugs-gradle-plugin to 5.0.9, spotbugs t…
HEdingfield Aug 7, 2022
d85c040
Fixes Gradle 7.5.1 breaking Checkstyle suppressions.
HEdingfield Aug 7, 2022
3c3a08e
Adds comment about fixing suppressions being ignored.
HEdingfield Aug 7, 2022
a1bcd78
Upgrades javafx to 18; addresses `unchecked` Java compiler warning; m…
HEdingfield Aug 7, 2022
075af4b
Prevents copyright from appearing in non-source files.
HEdingfield Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/copyright/profiles_settings.xml
View file
Open in desktop

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
View file
Open in desktop

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
View file
Open in desktop
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}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this note.

EDIT: ah, I see that this changed in the file itself. Can you clarify this comment to:

  • cite something
  • indicate that the edit takes place in that file?

Also, was that file updated by just downloading a new one? It might be good to write down a curl command here; you could even write curl ... | sed s|org.checkstyle...|\${config_log}/...| to automate this away entirely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added more context per your request. Yeah, I just copy and paste it from GH usually, and I like the idea of automating it with a script like that except the address would need to be changed each time to the match most recent version posted to the Maven repo, and sed is a no-go in my Windows environment. :/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack, sorry, missed this PR with this change. Will include it in my next.

// 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
View file
Open in desktop
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