Gradle updates

build.gradle.kts

@@ -61,7 +61,7 @@ configurations["functionalTestImplementation"].extendsFrom(configurations["testI
 configurations["functionalTestRuntimeOnly"].extendsFrom(configurations["testRuntimeOnly"])
 
 // Add a task to run the functional tests
-val functionalTest by tasks.registering(Test::class) {
+tasks.register<Test>("functionalTest") {
     testClassesDirs = functionalTestSourceSet.output.classesDirs
     classpath = functionalTestSourceSet.runtimeClasspath
     useJUnitPlatform()
@@ -88,7 +88,7 @@ tasks.named<KotlinCompile>("compileKotlin") {
 
 tasks.named<Task>("check") {
     // Run the functional tests as part of `check`
-    dependsOn(functionalTest)
+    dependsOn("functionalTest")
 }
 
 tasks.named<Test>("test") {
@@ -97,7 +97,7 @@ tasks.named<Test>("test") {
 }
 
 tasks.jacocoTestReport {
-    dependsOn(functionalTest)
+    dependsOn("functionalTest")
     // Aggregate all execution data into a single XML report.
     executionData(fileTree(project.layout.buildDirectory).include("/jacoco/*.exec"))
     reports {

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/functionalTest/kotlin/git/semver/plugin/gradle/GitSemverPluginFunctionalTest.kt

@@ -93,12 +93,12 @@ class GitSemverPluginFunctionalTest {
     fun `can run print task`(printTask: String, pattern: String) {
         val projectDir = setupTestProject()
 
-        val result = run(projectDir, null, printTask, "--configuration-cache",  "-q")
+        val result = run(projectDir, null, printTask, "--configuration-cache", "-q")
 
         assertThat(result.output).containsPattern(pattern)
 
-        //Run it again to make sure configuration cache don't break it
-        val result2 = run(projectDir, null, printTask, "--configuration-cache",  "-q")
+        // Run it again to make sure the configuration cache does not break it.
+        val result2 = run(projectDir, null, printTask, "--configuration-cache", "-q", "--rerun")
 
         assertThat(result2.output).containsPattern(pattern)
     }

src/main/kotlin/git/semver/plugin/gradle/PrintTask.kt

@@ -1,17 +1,26 @@
 package git.semver.plugin.gradle
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
 import org.slf4j.LoggerFactory
+import java.io.File
 import java.nio.charset.StandardCharsets
 import java.nio.file.Paths
 import javax.inject.Inject
 import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 
-open class PrintTask @Inject constructor(private val printout: () -> Any, desc: String, reason: String) : DefaultTask() {
-    private var file:String? = null
+@CacheableTask
+abstract class PrintTask @Inject constructor(private val printout: () -> Any, desc: String, reason: String) : DefaultTask() {
+    @get:OutputFile
+    @get:Optional
+    val file: RegularFileProperty = project.objects.fileProperty()
+
     private val logger = LoggerFactory.getLogger(PrintTask::class.java)
 
     init {
@@ -24,16 +33,14 @@ open class PrintTask @Inject constructor(private val printout: () -> Any, desc:
 
     @Option(option = "file", description = "Print to a file ")
     fun setFile(file: String) {
-        this.file = file
+        this.file.set(File(file).absoluteFile)
     }
 
     @TaskAction
     fun print() {
-        val fileName = this.file
-        if (fileName != null) {
-            writeFile(fileName)
-        }
-        else {
+        if (file.isPresent) {
+            writeFile(file.get().asFile.absolutePath)
+        } else {
             println(printout())
         }
     }

src/main/kotlin/git/semver/plugin/gradle/ReleaseTask.kt

@@ -2,12 +2,13 @@ package git.semver.plugin.gradle
 
 import git.semver.plugin.scm.GitProvider
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
 import javax.inject.Inject
 
-
+@CacheableTask
 open class ReleaseTask @Inject constructor(private val settings: GitSemverPluginExtension) : DefaultTask() {
     private var preRelease: String? = null
     private var message: String? = null