Skip to content

Commit ada2b44

Browse files
committed
Expect different error in Gradle 9.1+
1 parent ce74ce4 commit ada2b44

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/fixture/GradleBuild.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.gradlex.jvm.dependency.conflict.test.fixture
22

33
import org.gradle.testkit.runner.BuildResult
44
import org.gradle.testkit.runner.GradleRunner
5+
import org.gradle.util.GradleVersion
56

67
import java.lang.management.ManagementFactory
78
import java.nio.file.Files
@@ -16,6 +17,7 @@ class GradleBuild {
1617
final static String GRADLE_VERSION_UNDER_TEST = System.getProperty("gradleVersionUnderTest")
1718
final static boolean GRADLE6_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("6.")
1819
final static boolean GRADLE7_TEST = GRADLE_VERSION_UNDER_TEST?.startsWith("7.")
20+
final static boolean GRADLE9_1 = !GRADLE_VERSION_UNDER_TEST || GradleVersion.version(GRADLE_VERSION_UNDER_TEST) >= GradleVersion.version("9.1")
1921

2022
GradleBuild(File projectDir = Files.createTempDirectory("gradle-build").toFile()) {
2123
this.projectDir = projectDir

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/patch/ModifyCapabilitiesTest.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ compileClasspath - Compile classpath for source set 'main'.
4747
"""
4848

4949
expect:
50-
fail().output.contains "Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]"
50+
GradleBuild.GRADLE9_1
51+
? fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:3.11' also provided by ['commons-lang:commons-lang:2.6' (compile)]")
52+
: fail().output.contains("Cannot select module with conflict on capability 'commons-lang:commons-lang:2.6' also provided by [org.apache.commons:commons-lang3:3.11(compile)]")
5153
}
5254

5355
def "can remove capability by enum"() {

0 commit comments

Comments
 (0)