[#333] Fix Gradle configuration cache issues for 8.1 and up (#345)

* [#333] Fix Gradle configuration cache issues for 8.1 and up The fix has a test but it's not hooked into the build because of cascading version incompatibility issues, which the pitest-gradle-plugin project needs to deal with. * [#333] Fix failing functional test with Gradle 8.1 By explicitly excluding not compatible Spock from its classpath. --------- Co-authored-by: Marcin Zajączkowski <[email protected]>
szpak · Jul 12, 2023 · 35012e5 · 35012e5
1 parent 00d7f3f
commit 35012e5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/funcTest/groovy/info/solidsoft/gradle/pitest/functional/Junit5FunctionalSpec.groovy b/src/funcTest/groovy/info/solidsoft/gradle/pitest/functional/Junit5FunctionalSpec.groovy
@@ -1,7 +1,9 @@
 package info.solidsoft.gradle.pitest.functional
 
+import com.google.common.base.Predicates
 import groovy.transform.CompileDynamic
 import nebula.test.functional.ExecutionResult
+import nebula.test.functional.GradleRunner
 import spock.lang.Issue
 
 @CompileDynamic
@@ -85,4 +87,19 @@ class Junit5FunctionalSpec extends AbstractPitestFunctionalSpec {
             result2.standardOutput.contains('Reusing configuration cache.')
     }
 
+    @Issue("https://github.com/szpak/gradle-pitest-plugin/issues/333")
+    void "should not reference project data at execution time (causing InvalidUserCodeException in Gradle 8.1+)"() {
+        given:
+            gradleVersion = "8.1"
+            classpathFilter = Predicates.and(GradleRunner.CLASSPATH_DEFAULT, PitestPluginGradleVersionFunctionalSpec.FILTER_SPOCK_JAR)
+        and:
+            copyResources("testProjects/junit5simple", "")
+        when:
+            ExecutionResult result = runTasks('pitest', '--configuration-cache', '--rerun-tasks')
+        then:
+            !result.standardError.contains('invocation of \'Task.project\' at execution time is unsupported.')
+            !result.failure
+            result.wasExecuted('pitest')
+    }
+
 }
diff --git a/...vy/info/solidsoft/gradle/pitest/functional/PitestPluginGradleVersionFunctionalSpec.groovy b/...vy/info/solidsoft/gradle/pitest/functional/PitestPluginGradleVersionFunctionalSpec.groovy
@@ -3,6 +3,7 @@ package info.solidsoft.gradle.pitest.functional
 import com.google.common.base.Predicate
 import com.google.common.base.Predicates
 import groovy.transform.CompileDynamic
+import groovy.transform.PackageScope
 import groovy.util.logging.Slf4j
 import info.solidsoft.gradle.pitest.PitestPlugin
 import nebula.test.functional.ExecutionResult
@@ -94,7 +95,9 @@ class PitestPluginGradleVersionFunctionalSpec extends AbstractPitestFunctionalSp
     //To prevent failure when Spock for Groovy 2.5 is run with Groovy 3.0 delivered with Gradle 7+
     //Spock is not needed in this artificial project - just the test classpath leaks to Gradle instance started by Nebula
     private static final Pattern SPOCK_JAR_PATTERN = Pattern.compile(".*spock-core-2\\..*.jar")
-    private static final Predicate<URL> FILTER_SPOCK_JAR = { URL url ->
+    @SuppressWarnings('JUnitPublicProperty')
+    @PackageScope
+    static final Predicate<URL> FILTER_SPOCK_JAR = { URL url ->
         return !url.toExternalForm().matches(SPOCK_JAR_PATTERN)
     } as Predicate<URL>
 

diff --git a/src/main/groovy/info/solidsoft/gradle/pitest/PitestTask.groovy b/src/main/groovy/info/solidsoft/gradle/pitest/PitestTask.groovy
@@ -249,10 +249,14 @@ class PitestTask extends JavaExec {
     @Optional
     List<String> overriddenTargetTests  //should be Set<String> or SetProperty but it's not supported in Gradle as of 5.6.1
 
+    @Internal
+    File rootDir
+
     PitestTask() {
         getMainClass().set("org.pitest.mutationtest.commandline.MutationCoverageReport")
 
         ObjectFactory of = project.objects
+        rootDir = project.rootDir
 
         testPlugin = of.property(String)
         reportDir = of.directoryProperty()
@@ -305,19 +309,19 @@ class PitestTask extends JavaExec {
 
     @Input
     String getAdditionalClasspathFilePath() {
-        return additionalClasspathFile.asFile.get().relativePath(project.rootProject.rootDir)
+        return additionalClasspathFile.asFile.get().relativePath(rootDir)
     }
 
     @Input
     @Optional
     String getHistoryInputLocationPath() {
         //?. operator doesn't work with Gradle Providers
-        return historyInputLocation.isPresent() ? historyInputLocation.asFile.get().relativePath(project.rootProject.rootDir) : null
+        return historyInputLocation.isPresent() ? historyInputLocation.asFile.get().relativePath(rootDir) : null
     }
 
     @Input
     String getDefaultFileForHistoryDataPath() {
-        return defaultFileForHistoryData.asFile.get().relativePath(project.rootProject.rootDir)
+        return defaultFileForHistoryData.asFile.get().relativePath(rootDir)
     }
 
     @Input