Cleanup build task

Author: fzhinkin

api/binary-compatibility-validator.api

@@ -162,7 +162,7 @@ public final class kotlinx/validation/api/klib/KlibDumpKt {
 	public static final fun saveTo (Lkotlinx/validation/api/klib/KlibDump;Ljava/io/File;)V
 }
 
-public final class kotlinx/validation/api/klib/KlibSignatureVersion {
+public final class kotlinx/validation/api/klib/KlibSignatureVersion : java/io/Serializable {
 	public static final field Companion Lkotlinx/validation/api/klib/KlibSignatureVersion$Companion;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I

src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt

@@ -614,9 +614,8 @@ private class KlibValidationPipelineBuilder(
             // 'group' is not specified deliberately, so it will be hidden from ./gradlew tasks
             description = "Builds Kotlin KLib ABI dump for 'main' compilations of $projectName. " +
                     "Complementary task and shouldn't be called manually"
-            klibFile = project.files(project.provider { compilation.output.classesDirs })
-            compilationDependencies = project.files(project.provider { compilation.compileDependencyFiles })
-            signatureVersion = SerializableSignatureVersion(extension.klib.signatureVersion)
+            klibFile.from(project.provider { compilation.output.classesDirs })
+            signatureVersion = extension.klib.signatureVersion
             outputApiFile = apiBuildDir.resolve(klibDumpFileName)
         }
         return buildTask

src/main/kotlin/KotlinKlibAbiBuildTask.kt

@@ -9,42 +9,27 @@ import kotlinx.validation.api.klib.KLibDumpFilters
 import kotlinx.validation.api.klib.KlibDump
 import kotlinx.validation.api.klib.KlibSignatureVersion
 import kotlinx.validation.api.klib.saveTo
-import org.gradle.api.file.FileCollection
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
-import java.io.Serializable
-
-internal class SerializableSignatureVersion(val version: Int) : Serializable {
-    constructor(version: KlibSignatureVersion) : this(version.version)
-
-    fun toKlibSignatureVersion(): KlibSignatureVersion = KlibSignatureVersion(version)
-}
 
 /**
  * Generates a text file with a KLib ABI dump for a single klib.
  */
 internal abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
 
     /**
-     * Path to a klib to dump.
-     */
-    @InputFiles
-    lateinit var klibFile: FileCollection
-
-    /**
-     * Bind this task with a klib compilation.
+     * Collection consisting of a single path to compiled klib (either file, or directory).
      */
-    @InputFiles
-    lateinit var compilationDependencies: FileCollection
+    @get:InputFiles
+    val klibFile: ConfigurableFileCollection = project.objects.fileCollection()
 
     /**
      * Refer to [KlibValidationSettings.signatureVersion] for details.
      */
-    @Optional
     @get:Input
-    var signatureVersion: SerializableSignatureVersion = SerializableSignatureVersion(KlibSignatureVersion.LATEST)
+    var signatureVersion: KlibSignatureVersion = KlibSignatureVersion.LATEST
 
     /**
      * Name of a target [klibFile] was compiled for.
@@ -62,7 +47,7 @@ internal abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
             ignoredClasses.addAll(this@KotlinKlibAbiBuildTask.ignoredClasses)
             ignoredPackages.addAll(this@KotlinKlibAbiBuildTask.ignoredPackages)
             nonPublicMarkers.addAll(this@KotlinKlibAbiBuildTask.nonPublicMarkers)
-            signatureVersion = this@KotlinKlibAbiBuildTask.signatureVersion.toKlibSignatureVersion()
+            signatureVersion = this@KotlinKlibAbiBuildTask.signatureVersion
         })
 
         dump.saveTo(outputApiFile)

src/main/kotlin/api/klib/KlibSignatureVersion.kt

@@ -5,7 +5,9 @@
 
 package kotlinx.validation.api.klib
 
-public class KlibSignatureVersion internal constructor(internal val version: Int) {
+import java.io.Serializable
+
+public class KlibSignatureVersion internal constructor(internal val version: Int) : Serializable {
 
     public companion object {
         public fun of(value: Int): KlibSignatureVersion {
@@ -16,6 +18,9 @@ public class KlibSignatureVersion internal constructor(internal val version: Int
         }
 
         public val LATEST: KlibSignatureVersion = KlibSignatureVersion(Int.MIN_VALUE)
+
+        @JvmStatic
+        private val serialVersionUID: Long = 1
     }
 
     override fun equals(other: Any?): Boolean {