Move checkoutActionClassFQN under InferFromClasspath

Author: krzema12

github-workflows-kt/api/github-workflows-kt.api

@@ -3250,7 +3250,10 @@ public final class io/github/typesafegithub/workflows/yaml/CheckoutActionVersion
 }
 
 public final class io/github/typesafegithub/workflows/yaml/CheckoutActionVersionSource$InferFromClasspath : io/github/typesafegithub/workflows/yaml/CheckoutActionVersionSource {
-	public static final field INSTANCE Lio/github/typesafegithub/workflows/yaml/CheckoutActionVersionSource$InferFromClasspath;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getCheckoutActionClassFQN ()Ljava/lang/String;
 }
 
 public abstract interface class io/github/typesafegithub/workflows/yaml/ConsistencyCheckJobConfig {

github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ConsistencyCheckJob.kt

@@ -45,9 +45,9 @@ internal fun WorkflowBuilder.consistencyCheckJob(
             when (consistencyCheckJobConfig.checkoutActionVersion) {
                 CheckoutActionVersionSource.BundledWithLibrary -> "v4"
                 is CheckoutActionVersionSource.Given -> consistencyCheckJobConfig.checkoutActionVersion.version
-                CheckoutActionVersionSource.InferFromClasspath ->
+                is CheckoutActionVersionSource.InferFromClasspath ->
                     inferCheckoutActionVersionFromClasspath(
-                        consistencyCheckJobConfig.checkoutActionClassFQN,
+                        consistencyCheckJobConfig.checkoutActionVersion.checkoutActionClassFQN,
                     )
             }
 
@@ -122,7 +122,7 @@ private fun inferCheckoutActionVersionFromClasspath(checkoutActionClassFQN: Stri
             error(
                 "actions/checkout is not found in the classpath! " +
                     "Either add a dependency on it (`@file:DependsOn(\"actions:checkout:<version>\")`), " +
-                    "or don't use CheckoutActionVersionSource.InferFromClasspath",
+                    "or don't use CheckoutActionVersionSource.InferFromClasspath()",
             )
         } as Class<*>
     // It's easier to call the primary constructor, even though it's private, because

github-workflows-kt/src/main/kotlin/io/github/typesafegithub/workflows/yaml/ConsistencyCheckJobConfig.kt

@@ -8,7 +8,6 @@ public val DEFAULT_CONSISTENCY_CHECK_JOB_CONFIG: ConsistencyCheckJobConfig.Confi
         condition = null,
         env = emptyMap(),
         checkoutActionVersion = CheckoutActionVersionSource.BundledWithLibrary,
-        checkoutActionClassFQN = "io.github.typesafegithub.workflows.actions.actions.Checkout",
         additionalSteps = null,
         useLocalBindingsServerAsFallback = false,
     )
@@ -24,11 +23,6 @@ public sealed interface ConsistencyCheckJobConfig {
          * Lets the user choose between convenience of automatic updates and more determinism and control if required.
          */
         val checkoutActionVersion: CheckoutActionVersionSource,
-        /**
-         * Specifies the fully qualified name of a binding class for actions/checkout. Can be overridden if a custom
-         * binding class is provided for this action, under a different FQN.
-         */
-        val checkoutActionClassFQN: String,
         val additionalSteps: (JobBuilder<JobOutputs.EMPTY>.() -> Unit)?,
         /**
          * If the script execution step in the consistency check job fails, another attempt to execute is made with a
@@ -57,7 +51,13 @@ public sealed interface CheckoutActionVersionSource {
      *
      * This is the most convenient option, and a candidate to become the default one.
      */
-    public object InferFromClasspath : CheckoutActionVersionSource
+    public class InferFromClasspath(
+        /**
+         * Specifies the fully qualified name of a binding class for actions/checkout. Can be overridden if a custom
+         * binding class is provided for this action, under a different FQN.
+         */
+        public val checkoutActionClassFQN: String = "io.github.typesafegithub.workflows.actions.actions.Checkout",
+    ) : CheckoutActionVersionSource
 
     /**
      * Useful if it's desired to specify a concrete version by hand, right in your workflow.

github-workflows-kt/src/test/kotlin/io/github/typesafegithub/workflows/IntegrationTest.kt

@@ -384,7 +384,7 @@ class IntegrationTest :
                 sourceFile = sourceTempFile,
                 consistencyCheckJobConfig =
                     DEFAULT_CONSISTENCY_CHECK_JOB_CONFIG.copy(
-                        checkoutActionVersion = CheckoutActionVersionSource.InferFromClasspath,
+                        checkoutActionVersion = CheckoutActionVersionSource.InferFromClasspath(),
                     ),
             ) {
                 job(
@@ -443,8 +443,10 @@ class IntegrationTest :
                     sourceFile = sourceTempFile,
                     consistencyCheckJobConfig =
                         DEFAULT_CONSISTENCY_CHECK_JOB_CONFIG.copy(
-                            checkoutActionVersion = CheckoutActionVersionSource.InferFromClasspath,
-                            checkoutActionClassFQN = "does.not.Exist",
+                            checkoutActionVersion =
+                                CheckoutActionVersionSource.InferFromClasspath(
+                                    checkoutActionClassFQN = "does.not.Exist",
+                                ),
                         ),
                 ) {
                     job(
@@ -460,7 +462,7 @@ class IntegrationTest :
             }.also {
                 it.message shouldBe "actions/checkout is not found in the classpath! " +
                     "Either add a dependency on it (`@file:DependsOn(\"actions:checkout:<version>\")`), " +
-                    "or don't use CheckoutActionVersionSource.InferFromClasspath"
+                    "or don't use CheckoutActionVersionSource.InferFromClasspath()"
             }
         }