Skip to content

Commit

Permalink
Fix dependency conflict in JQwik.
Browse files Browse the repository at this point in the history
Recently JUnit was upgraded. Rebasing revealed a dependency conflict.
  • Loading branch information
ZachBray committed Nov 13, 2023
1 parent b57443b commit 0314513
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Build SbeTool
run: ./gradlew
- name: Build .NET library
run: ./csharp/build.sh
- name: Run property tests
Expand Down
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def checkstyleVersion = '9.3'
def hamcrestVersion = '2.2'
def mockitoVersion = '4.11.0'
def junitVersion = '5.10.1'
def jqwikVersion = '1.8.0'
def jqwikVersion = '1.8.1'
def jsonVersion = '20230618'
def jmhVersion = '1.37'
def agronaVersion = '1.20.0'
Expand Down Expand Up @@ -294,11 +294,17 @@ project(':sbe-tool') {
}

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

dependencies {
implementation project()
implementation "net.jqwik:jqwik:${jqwikVersion}"
implementation("net.jqwik:jqwik:${jqwikVersion}") {
// Exclude JUnit 5 dependencies that are already provided due to useJUnitJupiter
exclude group: 'org.junit.platform', module: 'junit-platform-commons'
exclude group: 'org.junit.platform', module: 'junit-platform-engine'
}
implementation "org.json:json:${jsonVersion}"
}

Expand Down

0 comments on commit 0314513

Please sign in to comment.