Skip to content

Commit 19c3849

Browse files
authored
Merge branch 'master' into iss54/extract_asciidoc_reporter
2 parents 9cb8170 + 80346da commit 19c3849

File tree

57 files changed

+164
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+164
-114
lines changed

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4.2.2
10-
- uses: gradle/actions/wrapper-validation@v4.3.1
10+
- uses: gradle/actions/wrapper-validation@v4.4.1

.github/workflows/jgiven_android_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v4.2.2
1212
- name: Set upt JDK 17
13-
uses: actions/setup-java@v4.7.0
13+
uses: actions/setup-java@v4.7.1
1414
with:
1515
java-version: 17
1616
distribution: 'adopt'
@@ -25,7 +25,7 @@ jobs:
2525
sudo udevadm control --reload-rules
2626
sudo udevadm trigger --name-match=kvm
2727
- name: Test Android plugin and Android example project
28-
uses: reactivecircus/android-emulator-runner@v2.33.0
28+
uses: reactivecircus/android-emulator-runner@v2.34.0
2929
with:
3030
api-level: 29
3131
script: "bash -c 'source scripts/source_files/helper_functions.sh && runAndroidTestOnGivenProject jgiven-android-test/build.gradle 1.1-t && runAndroidTestOnGivenProject example-projects/android/build.gradle 1.1-t'"

.github/workflows/jgiven_branch_and_pr_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && sudo apt install ./google-chrome-stable_current_amd64.deb && rm *.deb
1717
- uses: actions/checkout@v4.2.2
1818
- name: Set up JDK ${{matrix.java}}
19-
uses: actions/setup-java@v4.7.0
19+
uses: actions/setup-java@v4.7.1
2020
with:
2121
java-version: ${{matrix.java}}
2222
distribution: 'adopt'

.github/workflows/jgiven_examples_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/checkout@v4.2.2
1010
- name: Set up JDK 17
11-
uses: actions/setup-java@v4.7.0
11+
uses: actions/setup-java@v4.7.1
1212
with:
1313
java-version: '17'
1414
distribution: 'adopt'
@@ -78,7 +78,7 @@ jobs:
7878
steps:
7979
- uses: actions/checkout@v4.2.2
8080
- name: Set up JDK 17
81-
uses: actions/setup-java@v4.7.0
81+
uses: actions/setup-java@v4.7.1
8282
with:
8383
java-version: '17'
8484
distribution: 'adopt'

.github/workflows/mock_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
VERSION: '0.0.1-TEST'
1616
steps:
1717
- name: Set up JDK 17
18-
uses: actions/setup-java@v4.7.0
18+
uses: actions/setup-java@v4.7.1
1919
with:
2020
java-version: '17'
2121
distribution: 'adopt'

.github/workflows/run_renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout
1515
uses: actions/checkout@v4.2.2
1616
- name: Renovate-dry-run
17-
uses: renovatebot/github-action@v41.0.17
17+
uses: renovatebot/github-action@v43.0.4
1818
with:
1919
configurationFile: renovate.json
2020
token: ${{secrets.RENOVATE_TOKEN}}

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Release v2.0.3
2+
3+
## Fixed issues
4+
5+
* JGiven now comaptible with JUnit 5.13.0 [#1956](https://github.com/TNG/JGiven/pull/1956)
6+
* Upgraded paranamer to 2.8.3 [#1960](https://github.com/TNG/JGiven/issues/1960)
7+
* Various dependency upgrades
8+
19
# Release v2.0.2
210
## Fixed issues
311
* The java 17 example projects now comes with a basic logger. [#374](https://github.com/TNG/JGiven/issues/374) (thanks to rolfschumacher for reporting)

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ configure(subprojects) { subproject ->
296296
description = "${rootProject.description} - Module ${project.name}"
297297

298298
checkstyle {
299-
toolVersion = "10.21.4"
299+
toolVersion = "10.26.1"
300300
configFile = file("${rootProject.projectDir}/checkstyle.xml")
301301
showViolations = false
302302
ignoreFailures = true

example-projects/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.9.1'
9+
classpath 'com.android.tools.build:gradle:8.11.1'
1010
}
1111
}
1212

@@ -47,7 +47,7 @@ configurations {
4747
}
4848

4949
dependencies {
50-
implementation('androidx.appcompat:appcompat:1.7.0') {
50+
implementation('androidx.appcompat:appcompat:1.7.1') {
5151
exclude group: 'com.google.guava', module: 'listenablefuture'
5252
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
5353
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)