sort BCVTargets

Author: aSemy

modules/bcv-gradle-plugin/api/bcv-gradle-plugin.api

@@ -83,7 +83,6 @@ public abstract interface annotation class dev/adamko/kotlin/binary_compatibilit
 public abstract class dev/adamko/kotlin/binary_compatibility_validator/targets/BCVJvmTarget : dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget, org/gradle/api/Named {
 	public abstract fun getInputClasses ()Lorg/gradle/api/file/ConfigurableFileCollection;
 	public abstract fun getInputJar ()Lorg/gradle/api/file/RegularFileProperty;
-	public final fun getObjects ()Lorg/gradle/api/model/ObjectFactory;
 	public final fun getPlatformType ()Ljava/lang/String;
 }
 
@@ -95,8 +94,11 @@ public abstract class dev/adamko/kotlin/binary_compatibility_validator/targets/B
 	public final fun getTargetName ()Ljava/lang/String;
 }
 
-public abstract class dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget : dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTargetBaseSpec, java/io/Serializable, org/gradle/api/Named, org/gradle/api/plugins/ExtensionAware {
+public abstract class dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget : dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTargetBaseSpec, java/io/Serializable, java/lang/Comparable, org/gradle/api/Named, org/gradle/api/plugins/ExtensionAware {
+	public static final field Companion Ldev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget$Companion;
 	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun compareTo (Ldev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget;)I
+	public synthetic fun compareTo (Ljava/lang/Object;)I
 	public abstract fun getEnabled ()Lorg/gradle/api/provider/Property;
 	public abstract fun getIgnoredClasses ()Lorg/gradle/api/provider/SetProperty;
 	public abstract fun getIgnoredMarkers ()Lorg/gradle/api/provider/SetProperty;
@@ -107,6 +109,9 @@ public abstract class dev/adamko/kotlin/binary_compatibility_validator/targets/B
 	public abstract fun getPublicPackages ()Lorg/gradle/api/provider/SetProperty;
 }
 
+public final class dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTarget$Companion {
+}
+
 public abstract interface class dev/adamko/kotlin/binary_compatibility_validator/targets/BCVTargetBaseSpec : java/io/Serializable {
 	public abstract fun getEnabled ()Lorg/gradle/api/provider/Property;
 	public abstract fun getIgnoredClasses ()Lorg/gradle/api/provider/SetProperty;
@@ -171,3 +176,4 @@ public final class org/gradle/kotlin/dsl/BcvGradleDslAccessorsKt {
 	public static final fun binaryCompatibilityValidator (Lorg/gradle/api/initialization/Settings;Lkotlin/jvm/functions/Function1;)V
 	public static final fun getBinaryCompatibilityValidator (Lorg/gradle/api/initialization/Settings;)Ldev/adamko/kotlin/binary_compatibility_validator/BCVSettingsPlugin$Extension;
 }
+

modules/bcv-gradle-plugin/src/main/kotlin/targets/BCVJvmTarget.kt

@@ -23,7 +23,7 @@ constructor(
   @get:Internal
   val platformType: String,
   @get:Internal
-  val objects: ObjectFactory
+  internal val objects: ObjectFactory
 ) : BCVTarget(platformType), Named {
 
   @get:Classpath

modules/bcv-gradle-plugin/src/main/kotlin/targets/BCVTarget.kt

@@ -15,7 +15,7 @@ sealed class BCVTarget
 @Inject
 constructor(
   private val named: String,
-) : BCVTargetBaseSpec, Serializable, Named, ExtensionAware {
+) : BCVTargetBaseSpec, Serializable, Named, ExtensionAware, Comparable<BCVTarget> {
 
   @get:Input
   @get:Optional
@@ -60,6 +60,16 @@ constructor(
   @get:Optional
   abstract override val ignoredClasses: SetProperty<String>
 
+  override fun compareTo(other: BCVTarget): Int =
+    this.string().compareTo(other.string())
+
   @Input
   override fun getName(): String = named
+
+  companion object {
+    private fun BCVTarget.string(): String = when (this) {
+      is BCVJvmTarget  -> "BCVJvmTarget(${named})"
+      is BCVKLibTarget -> "BCVKLibTarget(${named})"
+    }
+  }
 }

modules/bcv-gradle-plugin/src/main/kotlin/tasks/BCVApiGenerateTask.kt

@@ -78,15 +78,15 @@ constructor(
 
     generateJvmTargets(
       workQueue = workQueue,
-      jvmTargets = enabledTargets.withType<BCVJvmTarget>(),
+      jvmTargets = enabledTargets.withType<BCVJvmTarget>().sorted(),
       outputApiBuildDir = outputApiBuildDir.get().asFile,
     )
 
     // TODO log when klib file doesn't exist
     // TODO log warning when klibFile has >1 file
     val klibTargets = enabledTargets.withType<BCVKLibTarget>()
       .filter { it.klibFile.singleOrNull()?.exists() == true }
-      .sortedBy { it.targetName }
+      .sorted()
 
     generateKLibTargets(
       workQueue = workQueue,