Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/issue-631_…
Browse files Browse the repository at this point in the history
…prompt-for-name
  • Loading branch information
artoonie committed Jun 27, 2023
2 parents d569026 + f690ddd commit b475089
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 93 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ name: "Generate Releases"

on:
release:
types: [published]
# To test this workflow without creating a release, uncomment the following and add a branch name:
# push:
# branches:
# - 'branch-name'
types: [ published ]
## To test this workflow without creating a release, uncomment the following and add a branch name (making sure "push"
## is at the same indent level as "release":
# push:
# branches:
# - 'branch-name'

jobs:
release:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- name: "Create base filename for all artifacts"
id: basefn
Expand Down Expand Up @@ -57,13 +58,13 @@ jobs:
id: exefn
shell: bash
run: echo "FILEPATH=build/${{ steps.basefn.outputs.FILEPATH }}${{ steps.ext.outputs.EXT }}" >> $GITHUB_OUTPUT

- uses: actions/checkout@v3

- name: "Set up JDK 17.0.2"
- name: "Set up JDK 20.0.1"
uses: actions/setup-java@v3
with:
java-version: '17.0.2'
java-version: '20.0.1'
distribution: 'temurin'

- name: "Validate Gradle wrapper"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: "Set up JDK 17"
- name: "Set up JDK 20.0.1"
uses: actions/setup-java@v2
with:
java-version: '17'
java-version: '20.0.1'
distribution: 'temurin'
- name: "Test with Gradle"
run: ./gradlew check
2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

34 changes: 19 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@ plugins {
id "application"
id "checkstyle"
// Latest version at: https://github.com/spotbugs/spotbugs-gradle-plugin/tags
id "com.github.spotbugs" version "5.0.9"
id "com.github.spotbugs" version "5.0.14"
id "idea"
id "java-library"
id "org.beryx.jlink" version "2.25.0"
id "org.openjfx.javafxplugin" version "0.0.11"
// Latest version at: https://github.com/beryx/badass-jlink-plugin/tags
id "org.beryx.jlink" version "2.26.0"
// Latest version at: https://github.com/openjfx/javafx-gradle-plugin/tags
id "org.openjfx.javafxplugin" version "0.0.14"
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.apache.commons:commons-csv:1.9.0'
implementation 'org.apache.poi:poi-ooxml:5.2.2'
implementation 'commons-cli:commons-cli:1.5.0'
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'
implementation 'org.apache.commons:commons-csv:1.10.0'
implementation 'org.apache.poi:poi-ooxml:5.2.3'
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
}

// ### Application plugin settings
application {
mainModule = "${moduleName}"
mainClass = "${moduleName}.Main"
}

Expand All @@ -40,7 +43,7 @@ run {
// ### Checkstyle plugin settings
checkstyle {
// Latest version at https://github.com/checkstyle/checkstyle/tags
toolVersion = '10.3.2'
toolVersion = '10.12.1'
// 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.3.2/src/main/resources/google_checks.xml
Expand All @@ -60,7 +63,7 @@ System.setProperty("org.checkstyle.google.suppressionfilter.config",

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

Expand All @@ -74,7 +77,7 @@ idea {
// ### Java plugin settings
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(20))
}
}

Expand All @@ -94,7 +97,8 @@ test {

// ### JavaFX plugin settings
javafx {
version = "18"
// Latest version here: https://gluonhq.com/products/javafx/
version = "20.0.1"
modules = ["javafx.base", "javafx.controls", "javafx.fxml", "javafx.graphics"]
}

Expand Down
Loading

0 comments on commit b475089

Please sign in to comment.