Take into consideration --project-version when creating BuildInfo (#2548)

Author: MaciejG604

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -326,6 +326,7 @@ final case class SharedOptions(
     bo.BuildOptions(
       sourceGeneratorOptions = bo.SourceGeneratorOptions(
         useBuildInfo = sourceGenerator.useBuildInfo,
+        projectVersion = sharedVersionOptions.projectVersion,
         computeVersion = value {
           sharedVersionOptions.computeVersion
             .map(Positioned.commandLine)

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -1662,6 +1662,46 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
     }
   }
 
+  test("BuildInfo should take into account --project-version") {
+    val inputs = TestInputs(
+      os.rel / "Main.scala" ->
+        s"""//> using buildInfo
+           |
+           |import scala.cli.build.BuildInfo
+           |
+           |object Main extends App {
+           |  assert(BuildInfo.projectVersion == Some("35.0.1"))
+           |}
+           |""".stripMargin
+    )
+
+    inputs.fromRoot { root =>
+      TestUtil.initializeGit(root, "v1.0.0")
+
+      val res =
+        os.proc(
+          TestUtil.cli,
+          "--power",
+          extraOptions,
+          ".",
+          "--compute-version",
+          "git",
+          "--project-version",
+          "35.0.1"
+        ).call(cwd = root)
+      val output = res.out.trim()
+
+      val projectDir = os.list(root / ".scala-build").filter(
+        _.baseName.startsWith(root.baseName + "_")
+      )
+      expect(projectDir.size == 1)
+      val buildInfoPath = projectDir.head / "src_generated" / "main" / "BuildInfo.scala"
+      expect(os.isFile(buildInfoPath))
+
+      expect(output == "")
+    }
+  }
+
   // Credentials tests
   test("repository credentials passed to coursier") {
     val testOrg     = "test-org"

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

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

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

@@ -2,6 +2,7 @@ package scala.build.options
 
 final case class SourceGeneratorOptions(
   useBuildInfo: Option[Boolean] = None,
+  projectVersion: Option[String] = None,
   computeVersion: Option[ComputeVersion] = None
 )