Skip to content

Commit 2e611b7

Browse files
committed
Fix dependency conflict in JQwik.
Recently JUnit was upgraded. Rebasing revealed a dependency conflict.
1 parent 1e9903c commit 2e611b7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/slow.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050
uses: actions/setup-dotnet@v2
5151
with:
5252
dotnet-version: ${{ matrix.dotnet }}
53-
- name: Build SbeTool
54-
run: ./gradlew
5553
- name: Build .NET library
5654
run: ./csharp/build.sh
5755
- name: Run property tests

build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def checkstyleVersion = '9.3'
5858
def hamcrestVersion = '2.2'
5959
def mockitoVersion = '4.11.0'
6060
def junitVersion = '5.10.2'
61-
def jqwikVersion = '1.8.0'
61+
def jqwikVersion = '1.8.1'
6262
def jsonVersion = '20230618'
6363
def jmhVersion = '1.37'
6464
def agronaVersion = '1.21.1'
@@ -297,11 +297,17 @@ project(':sbe-tool') {
297297
}
298298

299299
propertyTest(JvmTestSuite) {
300+
// We should be able to use _only_ the JQwik engine, but this issue is outstanding:
301+
// https://github.com/gradle/gradle/issues/21299
300302
useJUnitJupiter junitVersion
301303

302304
dependencies {
303305
implementation project()
304-
implementation "net.jqwik:jqwik:${jqwikVersion}"
306+
implementation("net.jqwik:jqwik:${jqwikVersion}") {
307+
// Exclude JUnit 5 dependencies that are already provided due to useJUnitJupiter
308+
exclude group: 'org.junit.platform', module: 'junit-platform-commons'
309+
exclude group: 'org.junit.platform', module: 'junit-platform-engine'
310+
}
305311
implementation "org.json:json:${jsonVersion}"
306312
}
307313

0 commit comments

Comments
 (0)