Use properties in CopyFile task

Author: fzhinkin

src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt

@@ -310,8 +310,8 @@ private fun Project.configureCheckTasks(
         isEnabled = apiCheckEnabled(projectName, extension) && apiBuild.map { it.enabled }.getOrElse(true)
         group = "other"
         description = "Syncs API from build dir to ${targetConfig.apiDir} dir for $projectName"
-        from = apiBuildDir.get().resolve(dumpFileName)
-        to = apiCheckDir.get().resolve(dumpFileName)
+        from.fileProvider(apiBuildDir.map { it.resolve(dumpFileName) })
+        to.fileProvider(apiCheckDir.map { it.resolve(dumpFileName) })
         dependsOn(apiBuild)
     }
 
@@ -387,19 +387,21 @@ private class KlibValidationPipelineBuilder(
 
         val klibMerge = project.mergeKlibsUmbrellaTask(klibDumpConfig, klibMergeDir)
         val klibMergeInferred = project.mergeInferredKlibsUmbrellaTask(klibDumpConfig, klibMergeInferredDir)
-        val klibDump = project.dumpKlibsTask(klibDumpConfig, klibApiDir, klibMergeInferredDir)
+        val klibDump = project.dumpKlibsTask(klibDumpConfig)
         val klibExtractAbiForSupportedTargets = project.extractAbi(klibDumpConfig, klibApiDir, klibExtractedFileDir)
         val klibCheck = project.checkKlibsTask(klibDumpConfig, project.provider { klibExtractedFileDir }, klibMergeDir)
-
+        klibDump.configure {
+            it.from.set(klibMergeInferred.flatMap { it.mergedApiFile })
+            val filename = project.klibDumpFileName
+            it.to.fileProvider(klibApiDir.map { it.resolve(filename) })
+        }
         commonApiDump.configure { it.dependsOn(klibDump) }
-        commonApiCheck.configure { it.dependsOn(klibCheck) }
 
-        klibDump.configure { it.dependsOn(klibMergeInferred) }
         klibCheck.configure {
             it.dependsOn(klibExtractAbiForSupportedTargets)
             it.dependsOn(klibMerge)
         }
-
+        commonApiCheck.configure { it.dependsOn(klibCheck) }
         project.configureTargets(klibApiDir, klibMerge, klibMergeInferred)
     }
 
@@ -418,16 +420,10 @@ private class KlibValidationPipelineBuilder(
         onlyIf("There are no klibs compiled for the project") { hasCompilableTargets.get() }
     }
 
-    private fun Project.dumpKlibsTask(
-        klibDumpConfig: TargetConfig,
-        klibApiDir: Provider<File>,
-        klibMergeDir: File
-    ) = project.task<CopyFile>(klibDumpConfig.apiTaskName("Dump")) {
+    private fun Project.dumpKlibsTask(klibDumpConfig: TargetConfig) = project.task<CopyFile>(klibDumpConfig.apiTaskName("Dump")) {
         isEnabled = klibAbiCheckEnabled(project.name, extension)
         description = "Syncs a KLib ABI dump from a build dir to the ${klibDumpConfig.apiDir} dir for ${project.name}"
         group = "other"
-        from = klibMergeDir.resolve(klibDumpFileName)
-        to = klibApiDir.get().resolve(klibDumpFileName)
         val hasCompilableTargets = project.hasCompilableTargetsPredicate()
         onlyIf("There are no klibs compiled for the project") { hasCompilableTargets.get() }
     }

src/main/kotlin/CopyFile.kt

@@ -6,6 +6,8 @@
 package kotlinx.validation
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
@@ -17,15 +19,15 @@ import java.nio.file.StandardCopyOption
 // and registers it as an output dependency. If there's another task reading from that particular
 // directory or writing into it, their input/output dependencies would clash and as long as
 // there will be no explicit ordering or dependencies between these tasks, Gradle would be unhappy.
-internal open class CopyFile : DefaultTask() {
-    @InputFiles
-    lateinit var from: File
+internal abstract class CopyFile : DefaultTask() {
+    @get:InputFile
+    abstract val from: RegularFileProperty
 
-    @OutputFile
-    lateinit var to: File
+    @get:OutputFile
+    abstract val to: RegularFileProperty
 
     @TaskAction
     fun copy() {
-        Files.copy(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        Files.copy(from.asFile.get().toPath(), to.asFile.get().toPath(), StandardCopyOption.REPLACE_EXISTING)
     }
 }