Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into dependabot/gradle/b…
Browse files Browse the repository at this point in the history
…uildSrc/org.slf4j-slf4j-api-2.0.0-alpha7

* upstream/main:
  Bump ikonli-materialdesign2-pack from 12.3.0 to 12.3.1 (#8591)
  Bump gittools/actions from 0.9.11 to 0.9.13 (#8587)
  Bump mockito-core from 4.3.1 to 4.4.0 (#8588)
  • Loading branch information
Siedlerchr committed Mar 21, 2022
2 parents f439d9c + 3876628 commit cd8d827
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ jobs:
with:
fetch-depth: 0
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.11
uses: gittools/actions/gitversion/setup@v0.9.13
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.11
uses: gittools/actions/gitversion/execute@v0.9.13
- name: Set up JDK
uses: actions/setup-java@v2
with:
Expand Down Expand Up @@ -156,12 +156,12 @@ jobs:
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.11
uses: gittools/actions/gitversion/setup@v0.9.13
with:
versionSpec: '5.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.11
uses: gittools/actions/gitversion/execute@v0.9.13
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ dependencies {

// JavaFX stuff
implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.1'
implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.0'
implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1'
implementation 'de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT'
implementation 'de.saxsys:mvvmfx:1.8.0'
implementation 'com.tobiasdiez:easybind:2.2'
Expand Down Expand Up @@ -206,7 +206,7 @@ dependencies {

testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
testImplementation 'org.mockito:mockito-core:4.3.1'
testImplementation 'org.mockito:mockito-core:4.4.0'
testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1'
Expand Down

0 comments on commit cd8d827

Please sign in to comment.