Review Feedback Vol. 2

Author: Vampire

build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/PreprocessGithubWorkflow.groovy

@@ -8,6 +8,7 @@ import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.jvm.toolchain.JavaLauncher
+import org.gradle.work.NormalizeLineEndings
 import org.gradle.workers.WorkerExecutor
 
 import javax.inject.Inject
@@ -16,10 +17,12 @@ import javax.inject.Inject
 @CacheableTask
 abstract class PreprocessGithubWorkflow extends DefaultTask {
   @InputFile
+  @NormalizeLineEndings
   @PathSensitive(PathSensitivity.RELATIVE)
   abstract RegularFileProperty getWorkflowScript()
 
   @InputFiles
+  @NormalizeLineEndings
   @PathSensitive(PathSensitivity.RELATIVE)
   abstract ConfigurableFileCollection getImportedFiles()
 

build-logic/preprocess-workflows/src/main/groovy/org/spockframework/gradle/PreprocessWorkflowsPlugin.groovy

@@ -20,6 +20,7 @@ import groovy.transform.CompileStatic
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.tasks.Delete
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainService
 
@@ -62,6 +63,12 @@ class PreprocessWorkflowsPlugin implements Plugin<Project> {
           it.languageVersion.set(JavaLanguageVersion.of(17))
         })
       }
+      def deleteWorkflowYaml = project.tasks.register("delete${pascalCasedWorkflowName}WorkflowYaml", Delete) {
+        it.delete(preprocessWorkflow.flatMap { it.workflowFile })
+      }
+      preprocessWorkflow.configure {
+        it.dependsOn(deleteWorkflowYaml)
+      }
       project.pluginManager.withPlugin('io.spring.nohttp') {
         // iff both tasks are run, workflow files should be generated before checkstyle check
         project.tasks.named('checkstyleNohttp') {

build.gradle

@@ -405,30 +405,39 @@ def configureGroovydoc(TaskProvider groovydoc) {
   }
 }
 
-tasks.preprocessBranchesAndPrsWorkflow {
-  inputs.file('.github/codecov.yml').withPropertyName('codecovConfig')
-  def preprocessBranchesAndPrsWorkflowCodecovOutput = layout.buildDirectory.file('codecov_branches-and-prs.yml')
-  outputs.file(preprocessBranchesAndPrsWorkflowCodecovOutput).withPropertyName('codecovConfig')
+def preprocessBranchesAndPrsWorkflowCodecovOutput = layout.buildDirectory.file('codecov_branches-and-prs.yml')
+def preprocessReleaseWorkflowCodecovOutput = layout.buildDirectory.file('codecov_release.yml')
 
+def copyCodecovConfig = tasks.register('copyCodecovConfig') {
   doLast {
     copy {
-      from(preprocessBranchesAndPrsWorkflowCodecovOutput)
+      from(
+        [
+          preprocessBranchesAndPrsWorkflowCodecovOutput,
+          preprocessReleaseWorkflowCodecovOutput
+        ].max {it.get().asFile.lastModified() })
       into('.github')
       rename { 'codecov.yml' }
     }
   }
 }
 
+tasks.preprocessBranchesAndPrsWorkflow {
+  inputs
+    .file('.github/codecov.yml')
+    .normalizeLineEndings()
+    .withPathSensitivity(PathSensitivity.RELATIVE)
+    .withPropertyName('codecovConfig')
+  outputs.file(preprocessBranchesAndPrsWorkflowCodecovOutput).withPropertyName('codecovConfig')
+  finalizedBy(copyCodecovConfig)
+}
+
 tasks.preprocessReleaseWorkflow {
-  inputs.file('.github/codecov.yml').withPropertyName('codecovConfig')
-  def preprocessReleaseWorkflowCodecovOutput = layout.buildDirectory.file('codecov_release.yml')
+  inputs
+    .file('.github/codecov.yml')
+    .normalizeLineEndings()
+    .withPathSensitivity(PathSensitivity.RELATIVE)
+    .withPropertyName('codecovConfig')
   outputs.file(preprocessReleaseWorkflowCodecovOutput).withPropertyName('codecovConfig')
-
-  doLast {
-    copy {
-      from(preprocessReleaseWorkflowCodecovOutput)
-      into('.github')
-      rename { 'codecov.yml' }
-    }
-  }
+  finalizedBy(copyCodecovConfig)
 }