Merge pull request #3197 from Gedochao/maintenance/export-sbt

NIT fixes for the `export` sub-command

Author: Gedochao

build.sc

@@ -518,6 +518,8 @@ trait Core extends ScalaCliCrossSbtModule
          |  def giter8Organization = "${Deps.giter8.dep.module.organization.value}"
          |  def giter8Name = "${Deps.giter8.dep.module.name.value}"
          |  def giter8Version = "${Deps.giter8.dep.version}"
+         |  
+         |  def sbtVersion = "${Deps.Versions.sbtVersion}"
          |
          |  def mavenVersion = "${Deps.Versions.mavenVersion}"
          |  def mavenScalaCompilerPluginVersion = "${Deps.Versions.mavenScalaCompilerPluginVersion}"

modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala

@@ -155,11 +155,15 @@ object Export extends ScalaCommand[ExportOptions] {
     val shouldExportToSbt   = options.sbt.getOrElse(false)
     val shouldExportToMaven = options.maven.getOrElse(false)
 
-    val exportOptions = List(shouldExportToMill, shouldExportToSbt, shouldExportToMaven)
-
-    if (exportOptions.count(identity) > 1) {
+    val exportOptions =
+      (if shouldExportToMill then List("Mill") else Nil) ++
+        (if shouldExportToSbt then List("SBT") else Nil) ++
+        (if shouldExportToMaven then List("Maven") else Nil)
+    val exportOptionsString = exportOptions.mkString(", ")
+    if exportOptions.length > 1 then {
       logger.error(
-        s"Error: Cannot export to both mill and sbt. Please pick one build tool to export."
+        s"""Error: Cannot export to more than one tool at once (currently chosen: $exportOptionsString). 
+           |Pick one build tool to export to.""".stripMargin
       )
       sys.exit(1)
     }
@@ -238,7 +242,7 @@ object Export extends ScalaCommand[ExportOptions] {
       project.print(System.out)
     }
     else {
-      val sbtVersion                  = options.sbtVersion.getOrElse("1.10.2")
+      val sbtVersion                  = options.sbtVersion.getOrElse(Constants.sbtVersion)
       val defaultMavenCompilerVersion = options.mvnVersion.getOrElse(Constants.mavenVersion)
       val defaultScalaMavenCompilerVersion =
         options.mvnScalaVersion.getOrElse(Constants.mavenScalaCompilerPluginVersion)

project/deps.sc

@@ -124,6 +124,7 @@ object Deps {
     def javaSemanticdb                    = "0.10.0"
     def javaClassName                     = "0.1.3"
     def bloop                             = "2.0.0"
+    def sbtVersion                        = "1.10.2"
     def mavenVersion                      = "3.8.1"
     def mavenScalaCompilerPluginVersion   = "4.9.1"
     def mavenExecPluginVersion            = "3.3.0"