From fe767c9b6b896ba70867862d36af783054ec7cfd Mon Sep 17 00:00:00 2001 From: Stefan Wolf Date: Wed, 13 Nov 2019 16:52:28 +0100 Subject: [PATCH] Restrict base version for cross version test So it doesn't try to run on pre 5.x versions. PathSensitivity has been introduced in 3.1, though it doesn't make much sense to run the test pre 5.0. #11330 --- ...TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subprojects/integ-test/src/crossVersionTest/groovy/org/gradle/integtests/TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy b/subprojects/integ-test/src/crossVersionTest/groovy/org/gradle/integtests/TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy index 680b9319c2fe..00e720ad0873 100644 --- a/subprojects/integ-test/src/crossVersionTest/groovy/org/gradle/integtests/TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy +++ b/subprojects/integ-test/src/crossVersionTest/groovy/org/gradle/integtests/TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy @@ -43,6 +43,7 @@ import org.gradle.plugins.ide.idea.GenerateIdeaProject import org.gradle.plugins.ide.idea.GenerateIdeaWorkspace import org.gradle.plugins.signing.Sign import org.gradle.util.GradleVersion +import org.junit.Assume import spock.lang.Issue /** @@ -214,6 +215,8 @@ apply plugin: SomePlugin @Issue("https://github.com/gradle/gradle/issues/11330") def "a subclass of JavaCompile with getSources receives the correct incremental changes"() { + // There is no use to make the test work pre-5.0, since the regression was introduced in 6.0 + Assume.assumeTrue(previous.version.baseVersion >= GradleVersion.version("5.0")) given: file("producer/build.gradle") << """ apply plugin: 'java' @@ -255,7 +258,7 @@ apply plugin: SomePlugin apply plugin: 'java' - tasks.register("myJavaCompile", MyCompileTask) { + task myJavaCompile(type: MyCompileTask) { def sourceSet = sourceSets.main def sourceDirectorySet = sourceSet.java addSource(sourceDirectorySet)