Merge branch 'devel'

Author: szpak

CHANGELOG.md

@@ -1,5 +1,13 @@
 # gradle-pitest-plugin changelog
 
+## 1.19.0-rc.2 - Unreleased
+
+ - pitestReportAggregate task is compatible with configuration cache in Gradle 9 - [#381](https://github.com/szpak/gradle-pitest-plugin/issues/381) - PR by [Luis Guillermo Gómez Galeano ](https://github.com/luisgomez29)
+ - PIT 1.20.3 by default
+ - Upgrade Gradle wrapper to 8.14.3
+
+Thanks to all the contributors to this release: @luisgomez29.
+
 ## 1.19.0-rc.1 - 2025-06-07
 
  - Java 17 is minimal supported* version

build.gradle

@@ -16,18 +16,18 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'pl.allegro.tech.build.axion-release:pl.allegro.tech.build.axion-release.gradle.plugin:1.18.18'
+        classpath 'pl.allegro.tech.build.axion-release:pl.allegro.tech.build.axion-release.gradle.plugin:1.20.1'
         classpath 'io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:2.0.0'
-        classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.52.0'
+        classpath 'com.gradle.publish:plugin-publish-plugin:2.0.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.53.0'
     }
 }
 
 java {
     sourceCompatibility = 1.8
 }
 
-ext.pitestAggregatorVersion = "1.19.5"   //Must be equal to default PIT version in PitestPlugin
+ext.pitestAggregatorVersion = "1.20.3"   //Must be equal to default PIT version in PitestPlugin
 
 repositories {
     mavenCentral()
@@ -51,7 +51,7 @@ dependencies {
         exclude group: 'org.codehaus.groovy'
     }
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation 'net.bytebuddy:byte-buddy:1.17.5' //for Spying in Spock
+    testImplementation 'net.bytebuddy:byte-buddy:1.17.7' //for Spying in Spock
 
     funcTestImplementation sourceSets.main.output  //to make production plugin classes visible in functional tests (it's not in testCompile configuration)
     funcTestImplementation sourceSets.test.output
@@ -67,6 +67,7 @@ tasks.register("funcTest", Test) {
     classpath = sourceSets.funcTest.runtimeClasspath
     jvmArgs '-Xmx1g'
 }
+
 funcTest.shouldRunAfter test
 check.shouldRunAfter funcTest
 check.dependsOn funcTestClasses     //or more generically: tasks.withType(AbstractCompile)

gradle/cdeliveryboy-release.gradle

@@ -104,7 +104,7 @@ if (hasProperty('pluginPortal')) {
 
 if (hasProperty('changelogSync')) {
 
-    task syncChangelog(type: Exec) {
+    tasks.register('syncChangelog', Exec) {
         doFirst { logger.info("Synchronizing changelog with GitHub for version ${project.version}") }
         commandLine 'chandler', 'push', "release/${project.version}", '--tag-prefix=release/'
     }

gradle/report-version-consistency-check.gradle

@@ -8,7 +8,7 @@ def validatePitestVersionProvider = tasks.register("validatePitestVersion") {
         inputs.files(sourceSets.main.output)
         inputs.file("build.gradle")
         inputs.file("gradle//report-version-consistency-check.gradle")
-        outputs.files(file("$buildDir/dummyVersionValidationOutput.txt")) //just to not be always up-to-date
+        outputs.files(layout.buildDirectory.file("dummyVersionValidationOutput.txt")) //just to not be always up-to-date
 
         Action<Void> validationAction = {
             logger.info("Configured 'pitestAggregatorVersion': {}", pitestAggregatorVersion)

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
+distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/funcTest/groovy/info/solidsoft/gradle/pitest/functional/AbstractPitestFunctionalSpec.groovy

@@ -15,6 +15,14 @@ abstract class AbstractPitestFunctionalSpec extends IntegrationSpec {
     void setup() {
         fork = true //to make stdout assertion work with Gradle 2.x - http://forums.gradle.org/gradle/topics/unable-to-catch-stdout-stderr-when-using-tooling-api-i-gradle-2-x#reply_15357743
         memorySafeMode = true   //shutdown Daemon after a few seconds of inactivity
+        enableConfigurationCache() // Create gradle.properties file with configuration cache enabled
+    }
+
+    private void enableConfigurationCache() {
+        File gradlePropsFile = new File(getProjectDir(), "gradle.properties")
+        gradlePropsFile.text = """
+                org.gradle.configuration-cache=true
+        """.stripIndent()
     }
 
     protected static String getBasicGradlePitestConfig() {

src/funcTest/groovy/info/solidsoft/gradle/pitest/functional/PitestPluginGeneralFunctionalSpec.groovy

@@ -134,7 +134,7 @@ class PitestPluginGeneralFunctionalSpec extends AbstractPitestFunctionalSpec {
             result2.getStandardOutput().contains("Task :pitest FROM-CACHE")
     }
 
-    private String quoteBackslashesInWindowsPath(File file) {
+    private static String quoteBackslashesInWindowsPath(File file) {
         //There is problem with backslash within '' or "" while running this test on Windows: "unexpected char"
         return file.absolutePath.replaceAll('\\\\', '\\\\\\\\')
     }

src/funcTest/groovy/info/solidsoft/gradle/pitest/functional/PitestPluginGradleVersionFunctionalSpec.groovy

@@ -120,7 +120,7 @@ class PitestPluginGradleVersionFunctionalSpec extends AbstractPitestFunctionalSp
     private static final List<String> GRADLE7_VERSIONS = ["7.6.4", "7.5.1", "7.4.2", "7.3.3", "7.2", "7.5.1", "7.4.1", "7.3.3", "7.2", "7.1.1", "7.0.2"]
     private static final List<String> GRADLE8_VERSIONS = [LATEST_KNOWN_GRADLE_VERSION.version, "8.14.2", "8.13", "8.12.1", "8.11.1", "8.10.2",
                                                           "8.9", "8.8", "8.7", "8.6.4", "8.5", "8.4", "8.3", "8.2.1", "8.1.1", "8.0.2"]
-    private static final List<String> GRADLE9_VERSIONS = ["9.0.0-milestone-9"]
+    private static final List<String> GRADLE9_VERSIONS = ["9.1.0", "9.0.0"]
     private static final List<String> GRADLE_LATEST_VERSIONS = [GRADLE6_VERSIONS.first(), GRADLE7_VERSIONS.first(), GRADLE8_VERSIONS.first(),
                                                                 GRADLE9_VERSIONS.first(), PitestPlugin.MINIMAL_SUPPORTED_GRADLE_VERSION.version]
 

src/main/groovy/info/solidsoft/gradle/pitest/AggregateReportTask.groovy

@@ -6,7 +6,6 @@ import org.gradle.api.Incubating
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Classpath
 import org.gradle.api.tasks.Input
@@ -36,30 +35,29 @@ import java.nio.charset.Charset
 abstract class AggregateReportTask extends DefaultTask {
 
     @OutputDirectory
-    final DirectoryProperty reportDir
+    abstract DirectoryProperty getReportDir()
 
     @OutputFile
-    final RegularFileProperty reportFile
+    abstract RegularFileProperty getReportFile()
 
     @SkipWhenEmpty
     @InputFiles
     @PathSensitive(PathSensitivity.RELATIVE)
-    final ConfigurableFileCollection sourceDirs
+    abstract ConfigurableFileCollection getSourceDirs()
 
     @SkipWhenEmpty
     @InputFiles
     @Classpath
-    final ConfigurableFileCollection additionalClasspath
+    abstract ConfigurableFileCollection getAdditionalClasspath()
 
     @SkipWhenEmpty
     @InputFiles
     @PathSensitive(PathSensitivity.RELATIVE)
-    final ConfigurableFileCollection mutationFiles
+    abstract ConfigurableFileCollection getMutationFiles()
 
-    @SkipWhenEmpty
     @InputFiles
     @PathSensitive(PathSensitivity.RELATIVE)
-    final ConfigurableFileCollection lineCoverageFiles
+    abstract ConfigurableFileCollection getLineCoverageFiles()
 
     //Stricter isolation level - https://docs.gradle.org/nightly/userguide/worker_api.html#changing_the_isolation_mode
     @InputFiles
@@ -68,42 +66,27 @@ abstract class AggregateReportTask extends DefaultTask {
 
     @Input
     @Optional
-    final Property<Charset> inputCharset
+    abstract Property<Charset> getInputCharset()
 
     @Input
     @Optional
-    final Property<Charset> outputCharset
+    abstract Property<Charset> getOutputCharset()
 
     @Input
     @Optional
-    final Property<Integer> testStrengthThreshold
+    abstract Property<Integer> getTestStrengthThreshold()
 
     @Input
     @Optional
-    final Property<Integer> mutationThreshold
+    abstract Property<Integer> getMutationThreshold()
 
     @Input
     @Optional
-    final Property<Integer> maxSurviving
+    abstract Property<Integer> getMaxSurviving()
 
     @Inject
     abstract WorkerExecutor getWorkerExecutor()
 
-    AggregateReportTask() {
-        ObjectFactory of = project.objects
-        reportDir = of.directoryProperty()
-        reportFile = of.fileProperty()
-        sourceDirs = of.fileCollection()
-        additionalClasspath = of.fileCollection()
-        mutationFiles = of.fileCollection()
-        lineCoverageFiles = of.fileCollection()
-        inputCharset = of.property(Charset)
-        outputCharset = of.property(Charset)
-        testStrengthThreshold = of.property(Integer)
-        mutationThreshold = of.property(Integer)
-        maxSurviving = of.property(Integer)
-    }
-
     @TaskAction
     void aggregate() {
         logger.info("Aggregating pitest reports (mutationFiles: {}, lineCoverageFiles: {})", mutationFiles.elements.getOrNull(), lineCoverageFiles.elements.getOrNull())

src/main/groovy/info/solidsoft/gradle/pitest/PitestAggregatorPlugin.groovy

@@ -108,7 +108,7 @@ class PitestAggregatorPlugin implements Plugin<Project> {
         if (project.extensions.findByType(ReportingExtension)) {
             return project.extensions.getByType(ReportingExtension).baseDirectory.asFile.get()
         }
-        return new File(project.buildDir, "reports")
+        return project.layout.buildDirectory.dir("reports").get().asFile
     }
 
     private Set<Project> getProjectsWithPitestPlugin() {