Reorder arguments of ComputeVersion classes

Author: MaciejG604

modules/build/src/test/scala/scala/build/options/publish/ComputeVersionTests.scala

@@ -15,7 +15,7 @@ class ComputeVersionTests extends munit.FunSuite {
       os.rel / "version" -> ver
     )
     inputs.fromRoot { root =>
-      val cv = ComputeVersion.Command(Nil, Seq("cat", "version"))
+      val cv = ComputeVersion.Command(Seq("cat", "version"), Nil)
       val readVersion = cv.get(root)
         .fold(ex => throw new Exception(ex), identity)
       expect(readVersion == ver)
@@ -31,7 +31,7 @@ class ComputeVersionTests extends munit.FunSuite {
       os.proc("git", "clone", repo)
         .call(cwd = root, stdin = os.Inherit, stdout = os.Inherit)
       val dir = root / "compute-version-test"
-      val cv  = ComputeVersion.GitTag(Nil, os.rel, true, "0.0.1-SNAPSHOT")
+      val cv  = ComputeVersion.GitTag(os.rel, true, Nil, "0.0.1-SNAPSHOT")
 
       val commitExpectedVersions = Seq(
         "8ea4e87f202fbcc369bec9615e7ddf2c14b39e9d" -> "0.2.0-1-g8ea4e87-SNAPSHOT",
@@ -56,7 +56,7 @@ class ComputeVersionTests extends munit.FunSuite {
       expect(!hasHead)
 
       val defaultVersion = "0.0.2-SNAPSHOT"
-      val cv             = ComputeVersion.GitTag(Nil, os.rel, true, defaultVersion)
+      val cv             = ComputeVersion.GitTag(os.rel, true, Nil, defaultVersion)
 
       val version = cv.get(root)
         .fold(ex => throw new Exception(ex), identity)

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

@@ -370,7 +370,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
     name
   }
   def defaultComputeVersion(mayDefaultToGitTag: Boolean): Option[ComputeVersion] =
-    if (mayDefaultToGitTag) Some(ComputeVersion.GitTag(Nil, os.rel, dynVer = false))
+    if (mayDefaultToGitTag) Some(ComputeVersion.GitTag(os.rel, dynVer = false, positions = Nil))
     else None
   def defaultVersionError =
     new MissingPublishOptionError("version", "--version", "publish.version")

modules/options/src/main/scala/scala/build/info/BuildInfo.scala

@@ -106,7 +106,9 @@ object BuildInfo {
         mainClass = options.mainClass,
         projectVersion = options.sourceGeneratorOptions.computeVersion
           .map(cv => value(cv.get(workspace)))
-          .orElse(ComputeVersion.GitTag(Nil, os.rel, dynVer = false).get(workspace).toOption)
+          .orElse(
+            ComputeVersion.GitTag(os.rel, dynVer = false, positions = Nil).get(workspace).toOption
+          )
       ),
       scalaVersionSettings(options),
       platformSettings(options)

modules/options/src/main/scala/scala/build/options/ComputeVersion.scala

@@ -5,8 +5,8 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.*
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.{Constants, Ref}
 
-import scala.build.{Position, Positioned}
 import scala.build.errors.{BuildException, MalformedInputError}
+import scala.build.{Position, Positioned}
 import scala.io.Codec
 import scala.jdk.CollectionConverters.*
 import scala.util.{Success, Try, Using}
@@ -19,37 +19,37 @@ sealed abstract class ComputeVersion extends Product with Serializable {
 
 object ComputeVersion {
 
-  final case class Command(positions: Seq[Position], command: Seq[String]) extends ComputeVersion {
+  final case class Command(command: Seq[String], positions: Seq[Position]) extends ComputeVersion {
     def get(workspace: os.Path): Either[BuildException, String] = {
       val maybeRes = Try(os.proc(command).call(stdin = os.Inherit, cwd = workspace, check = false))
       maybeRes match {
         case Success(res) if res.exitCode == 0 =>
           Right(res.out.trim(Codec.default))
         case _ =>
           Left(new Command.ComputeVersionCommandError(
-            positions,
             command,
-            maybeRes.map(_.exitCode).getOrElse(1)
+            maybeRes.map(_.exitCode).getOrElse(1),
+            positions
           ))
       }
     }
   }
 
   object Command {
     final class ComputeVersionCommandError(
-      positions: Seq[Position],
       command: Seq[String],
-      exitCode: Int
+      exitCode: Int,
+      positions: Seq[Position]
     ) extends BuildException(
           s"Error running command ${command.mkString(" ")} (exit code: $exitCode)",
           positions = positions
         )
   }
 
   final case class GitTag(
-    positions: Seq[Position],
     repo: os.FilePath,
     dynVer: Boolean,
+    positions: Seq[Position],
     defaultFirstVersion: String = "0.1.0-SNAPSHOT"
   ) extends ComputeVersion {
     import GitTag.GitTagError
@@ -166,25 +166,25 @@ object ComputeVersion {
 
   def parse(input: Positioned[String]): Either[BuildException, ComputeVersion] =
     if (input.value == "git" || input.value == "git:tag")
-      Right(ComputeVersion.GitTag(input.positions, os.rel, dynVer = false))
+      Right(ComputeVersion.GitTag(os.rel, dynVer = false, positions = input.positions))
     else if (input.value.startsWith("git:tag:"))
       Right(ComputeVersion.GitTag(
-        input.positions,
         os.FilePath(input.value.stripPrefix("git:tag:")),
-        dynVer = false
+        dynVer = false,
+        positions = input.positions
       ))
     else if (input.value == "git:dynver")
-      Right(ComputeVersion.GitTag(input.positions, os.rel, dynVer = true))
+      Right(ComputeVersion.GitTag(os.rel, dynVer = true, positions = input.positions))
     else if (input.value.startsWith("git:dynver:"))
       Right(ComputeVersion.GitTag(
-        input.positions,
         os.FilePath(input.value.stripPrefix("git:dynver:")),
-        dynVer = true
+        dynVer = true,
+        positions = input.positions
       ))
     else if (input.value.startsWith("command:["))
       try {
         val command = readFromString(input.value.stripPrefix("command:"))(commandCodec)
-        Right(ComputeVersion.Command(input.positions, command))
+        Right(ComputeVersion.Command(command, input.positions))
       }
       catch {
         case e: JsonReaderException =>
@@ -200,7 +200,7 @@ object ComputeVersion {
       }
     else if (input.value.startsWith("command:")) {
       val command = input.value.stripPrefix("command:").split("\\s+").toSeq
-      Right(ComputeVersion.Command(input.positions, command))
+      Right(ComputeVersion.Command(command, input.positions))
     }
     else
       Left(