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

Update Gradle to 7.6 and use v3 GitHub Actions #887

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11, 17, 18]
java: [8, 11, 17, 19]
fail-fast: false
max-parallel: 4
name: JDK ${{ matrix.java }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: ${{ matrix.java }}
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ ext {
test: [
'commons-io:commons-io:2.11.0',
'junit:junit:4.13.+',
'org.junit.vintage:junit-vintage-engine:5.8.+',
'org.junit.vintage:junit-vintage-engine:5.9.+',
'org.assertj:assertj-core:3.22.0',
'org.hamcrest:hamcrest:2.2',
'org.glassfish:jakarta.json:2.0.1',
'org.eclipse:yasson:2.0.4',
//'org.apache.johnzon:johnzon-jsonb:1.2.12',
'org.slf4j:slf4j-simple:1.7.36',
'org.apache.logging.log4j:log4j-slf4j-impl:2.19.+',
'org.apache.logging.log4j:log4j-jul:2.19.+',
'com.google.code.gson:gson:2.10.1',
'org.hamcrest:hamcrest:2.2',
'com.fasterxml.jackson.core:jackson-databind:2.14.2',
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions json-path-assert/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ dependencies {
testImplementation libs.jsonSmart
testImplementation libs.test
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
}
2 changes: 2 additions & 0 deletions json-path/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ dependencies {

testImplementation libs.test
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
testRuntimeOnly 'org.apache.logging.log4j:log4j-jul'
}