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.

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

Upgradede dendencies #240

Merged
merged 7 commits into from
Apr 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/build-infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@ on:

jobs:
build:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
- name: Cache npm files
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ jobs:
matrix:
java: [17]
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.java }}
cancel-in-progress: true
name: Build on ${{ matrix.os }} with Java ${{ matrix.java }}
runs-on: ${{ matrix.os }}
env:
Expand All @@ -20,7 +23,7 @@ jobs:

steps:

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
Expand All @@ -34,7 +37,7 @@ jobs:
- uses: gradle/wrapper-validation-action@v1

- name: Cache SonarQube packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-java-${{ matrix.java }}-sonar
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:

jobs:
analyze:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
name: Analyze
runs-on: ubuntu-latest

Expand All @@ -20,7 +23,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.9.0) /

### Breaking Change

* [](): Removed pmsmart plugin as it is not maintained any more.
* [#239](https://github.com/itsallcode/white-rabbit/pull/239): Removed pmsmart plugin as it is not maintained any more.

### Changes / Bugfixes

* [#233](https://github.com/itsallcode/white-rabbit/pull/233): Upgrade dependencies, use [Gradle versions catalog](https://docs.gradle.org/current/userguide/platforms.html).
* [#240](https://github.com/itsallcode/white-rabbit/pull/240): Upgrade dependencies.
* [#147](https://github.com/itsallcode/white-rabbit/issues/147): Escape key no longer closes the main window.

## [1.8.0] - 2022-01-22
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ dependencyResolutionManagement {
version('mockito', '4.4.0')
version('log4j', '2.17.2')
version('seleniumVersion', '4.1.2')
version("javafx", '19-ea+3')
version("javafx", '19-ea+4')

library('junitParams', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junitJupiter')
library('assertj', 'org.assertj:assertj-core:3.22.0')
library('junitPioneer', 'org.junit-pioneer:junit-pioneer:1.6.2')
library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.9')
library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.10')
library('hamcrest', 'org.hamcrest:hamcrest-all:1.3')
library('mockito', 'org.mockito', 'mockito-core').versionRef('mockito')
library('mocktioJunit', 'org.mockito', 'mockito-junit-jupiter').versionRef('mockito')
Expand Down
Loading