Renamed a class holding target name and path to a dump

Kotlin · Mar 27, 2024 · 25efc08 · 25efc08
1 parent de4e7b0
commit 25efc08
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/api/binary-compatibility-validator.api b/api/binary-compatibility-validator.api
@@ -52,7 +52,7 @@ public abstract interface annotation class kotlinx/validation/ExperimentalBCVApi
 public abstract interface annotation class kotlinx/validation/ExternalApi : java/lang/annotation/Annotation {
 }
 
-public final class kotlinx/validation/GeneratedDump : java/io/Serializable {
+public final class kotlinx/validation/KlibDumpMetadata : java/io/Serializable {
 	public fun <init> (Lkotlinx/validation/api/klib/KlibTarget;Lorg/gradle/api/file/RegularFileProperty;)V
 	public final fun getDumpFile ()Lorg/gradle/api/file/RegularFileProperty;
 	public final fun getTarget ()Lkotlinx/validation/api/klib/KlibTarget;

diff --git a/src/main/kotlin/-Utils.kt b/src/main/kotlin/-Utils.kt
@@ -40,7 +40,7 @@ private fun extractUnderlyingTarget(target: KotlinTarget): String {
 /**
  * Information about a generated klib dump.
  */
-public class GeneratedDump(
+public class KlibDumpMetadata(
     /**
      * The target the dump was generated for.
      */

diff --git a/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt b/src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
@@ -497,8 +497,8 @@ private class KlibValidationPipelineBuilder(
         val kotlin = project.kotlinMultiplatform
 
         val supportedTargetsProvider = supportedTargets()
-        val generatedDumps = objects.listProperty(GeneratedDump::class.java)
-        val inferredDumps = objects.listProperty(GeneratedDump::class.java)
+        val generatedDumps = objects.listProperty(KlibDumpMetadata::class.java)
+        val inferredDumps = objects.listProperty(KlibDumpMetadata::class.java)
         mergeTask.configure {
             it.dumps.addAll(generatedDumps)
             it.doFirst {
@@ -526,7 +526,7 @@ private class KlibValidationPipelineBuilder(
             if (targetSupported) {
                 val buildTargetAbi = configureKlibCompilation(mainCompilation, extension, targetConfig,
                     target, apiBuildDir)
-                generatedDumps.add(GeneratedDump(target,
+                generatedDumps.add(KlibDumpMetadata(target,
                     objects.fileProperty().also { it.set(buildTargetAbi.flatMap { it.outputAbiFile }) }))
                 return@configureEach
             }
@@ -545,7 +545,7 @@ private class KlibValidationPipelineBuilder(
                 apiBuildDir
             )
             proxy.configure { it.inputDumps.addAll(generatedDumps) }
-            inferredDumps.add(GeneratedDump(currentTarget.toKlibTarget(),
+            inferredDumps.add(KlibDumpMetadata(currentTarget.toKlibTarget(),
                 objects.fileProperty().also {
                     it.set(proxy.flatMap { it.outputAbiFile })
                 }))

diff --git a/src/main/kotlin/KotlinKlibInferAbiTask.kt b/src/main/kotlin/KotlinKlibInferAbiTask.kt
@@ -34,7 +34,7 @@ public abstract class KotlinKlibInferAbiTask : DefaultTask() {
      * Newly created dumps that will be used for ABI inference.
      */
     @get:Nested
-    public abstract val inputDumps: ListProperty<GeneratedDump>
+    public abstract val inputDumps: ListProperty<KlibDumpMetadata>
 
     /**
      * Previously generated merged ABI dump file, the golden image every dump should be verified against.

diff --git a/src/main/kotlin/KotlinKlibMergeAbiTask.kt b/src/main/kotlin/KotlinKlibMergeAbiTask.kt
@@ -19,11 +19,11 @@ public abstract class KotlinKlibMergeAbiTask : DefaultTask() {
     /**
      * Dumps to merge.
      *
-     * If a file referred by [GeneratedDump.dumpFile] does not exist, it will be ignored and corresponding
+     * If a file referred by [KlibDumpMetadata.dumpFile] does not exist, it will be ignored and corresponding
      * target will not be mentioned in the resulting merged dump.
      */
     @get:Nested
-    public abstract val dumps: ListProperty<GeneratedDump>
+    public abstract val dumps: ListProperty<KlibDumpMetadata>
 
     /**
      * A path to a resulting merged dump file.