Merge pull request #1552 from alexarchambault/remove-cli-options-module

Remove cli-options module

Author: alexarchambault

build.sc

@@ -39,18 +39,18 @@ implicit def millModuleBasePath: define.BasePath =
 
 object cli extends Cli
 
-object `cli-options`  extends CliOptions
-object `build-macros` extends BuildMacros
-object config         extends Cross[Config](Scala.all: _*)
-object options        extends Options
-object scalaparse     extends ScalaParse
-object directives     extends Directives
-object core           extends Core
-object `build-module` extends Build
-object runner         extends Cross[Runner](Scala.runnerScalaVersions: _*)
-object `test-runner`  extends Cross[TestRunner](Scala.runnerScalaVersions: _*)
-object `bloop-rifle`  extends Cross[BloopRifle](Scala.all: _*)
-object `tasty-lib`    extends Cross[TastyLib](Scala.all: _*)
+object `specification-level` extends SpecificationLevel
+object `build-macros`        extends BuildMacros
+object config                extends Cross[Config](Scala.all: _*)
+object options               extends Options
+object scalaparse            extends ScalaParse
+object directives            extends Directives
+object core                  extends Core
+object `build-module`        extends Build
+object runner                extends Cross[Runner](Scala.runnerScalaVersions: _*)
+object `test-runner`         extends Cross[TestRunner](Scala.runnerScalaVersions: _*)
+object `bloop-rifle`         extends Cross[BloopRifle](Scala.all: _*)
+object `tasty-lib`           extends Cross[TastyLib](Scala.all: _*)
 // Runtime classes used within native image on Scala 3 replacing runtime from Scala
 object `scala3-runtime` extends Scala3Runtime
 // Logic to process classes that is shared between build and the scala-cli itself
@@ -416,7 +416,7 @@ trait Directives extends ScalaCliSbtModule with ScalaCliPublishModule with HasTe
     options,
     core,
     `build-macros`,
-    `cli-options`
+    `specification-level`
   )
   def scalacOptions = T {
     super.scalacOptions() ++ asyncScalacOptions(scalaVersion())
@@ -639,7 +639,7 @@ trait Build extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
   }
 }
 
-trait CliOptions extends SbtModule with ScalaCliPublishModule {
+trait SpecificationLevel extends SbtModule with ScalaCliPublishModule {
   def scalacOptions = T {
     val sv         = scalaVersion()
     val isScala213 = sv.startsWith("2.13.")
@@ -648,65 +648,53 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule {
       else Nil
     super.scalacOptions() ++ extraOptions
   }
-  def ivyDeps = super.ivyDeps() ++ Agg(
-    Deps.caseApp,
-    Deps.jsoniterCore213,
-    Deps.osLib,
-    Deps.signingCli.exclude((organization, "config_2.13"))
-  )
-  def compileIvyDeps = super.compileIvyDeps() ++ Seq(
-    Deps.jsoniterMacros
-  )
   def scalaVersion = Scala.defaultInternal
-  def repositories = super.repositories ++ customRepositories
+}
+
+trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
+    with HasMacroAnnotations with FormatNativeImageConf {
 
   def constantsFile = T.persistent {
     val dir  = T.dest / "constants"
     val dest = dir / "Constants.scala"
     val code =
-      s"""package scala.cli.commands
+      s"""package scala.cli.internal
          |
          |/** Build-time constants. Generated by mill. */
          |object Constants {
-         |  def defaultScalaVersion = "${Scala.defaultUser}"
-         |  def scalaJsVersion = "${Scala.scalaJs}"
-         |  def scalaJsCliVersion = "${InternalDeps.Versions.scalaJsCli}"
-         |  def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
-         |  def ammoniteVersion = "${Deps.ammonite.dep.version}"
-         |  def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
-         |  def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
-         |  def defaultGraalVMVersion = "${deps.graalVmVersion}"
-         |  def scalaPyVersion = "${Deps.scalaPy.dep.version}"
+         |  def launcherTypeResourcePath = "${launcherTypeResourcePath.toString}"
+         |  def defaultFilesResourcePath = "$defaultFilesResourcePath"
+         |  def maxAmmoniteScala3Version = "${Scala.maxAmmoniteScala3Version}"
          |}
          |""".stripMargin
     if (!os.isFile(dest) || os.read(dest) != code)
       os.write.over(dest, code, createFolders = true)
     PathRef(dir)
   }
-  def generatedSources = super.generatedSources() ++ Seq(constantsFile())
-}
-
-trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
-    with HasMacroAnnotations with FormatNativeImageConf {
-
-  def constantsFile = T.persistent {
+  def optionsConstantsFile = T.persistent {
     val dir  = T.dest / "constants"
     val dest = dir / "Constants.scala"
     val code =
-      s"""package scala.cli.internal
+      s"""package scala.cli.commands
          |
          |/** Build-time constants. Generated by mill. */
          |object Constants {
-         |  def launcherTypeResourcePath = "${launcherTypeResourcePath.toString}"
-         |  def defaultFilesResourcePath = "$defaultFilesResourcePath"
-         |  def maxAmmoniteScala3Version = "${Scala.maxAmmoniteScala3Version}"
+         |  def defaultScalaVersion = "${Scala.defaultUser}"
+         |  def scalaJsVersion = "${Scala.scalaJs}"
+         |  def scalaJsCliVersion = "${InternalDeps.Versions.scalaJsCli}"
+         |  def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
+         |  def ammoniteVersion = "${Deps.ammonite.dep.version}"
+         |  def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
+         |  def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
+         |  def defaultGraalVMVersion = "${deps.graalVmVersion}"
+         |  def scalaPyVersion = "${Deps.scalaPy.dep.version}"
          |}
          |""".stripMargin
     if (!os.isFile(dest) || os.read(dest) != code)
       os.write.over(dest, code, createFolders = true)
     PathRef(dir)
   }
-  def generatedSources = super.generatedSources() ++ Seq(constantsFile())
+  def generatedSources = super.generatedSources() ++ Seq(constantsFile(), optionsConstantsFile())
 
   def defaultFilesResources = T.persistent {
     val dir = T.dest / "resources"
@@ -752,7 +740,8 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
   def moduleDeps = Seq(
     `build-module`,
     config(Scala.scala3),
-    `scala3-graal`(Scala.scala3)
+    `scala3-graal`(Scala.scala3),
+    `specification-level`
   )
 
   def repositories = super.repositories ++ customRepositories

modules/build/src/main/scala/scala/build/Build.scala

@@ -65,28 +65,31 @@ object Build {
       mainClasses: Seq[String],
       commandString: String,
       logger: Logger
-    ): Either[MainClassError, String] = {
+    ): Either[BuildException, String] = {
       val defaultMainClassOpt = sources.defaultMainClass
         .filter(name => mainClasses.contains(name))
-      def foundMainClass =
+      def foundMainClass: Either[BuildException, String] =
         mainClasses match {
           case Seq()          => Left(new NoMainClassFoundError)
           case Seq(mainClass) => Right(mainClass)
           case _ =>
-            inferredMainClass(mainClasses, logger).left.flatMap { mainClasses =>
-              options.interactive
-                .chooseOne(
-                  "Found several main classes. Which would you like to run?",
-                  mainClasses.toList
-                )
-                .toRight {
-                  SeveralMainClassesFoundError(
-                    ::(mainClasses.head, mainClasses.tail.toList),
-                    commandString,
-                    Nil
-                  )
+            inferredMainClass(mainClasses, logger)
+              .left.flatMap { mainClasses =>
+                options.interactive.flatMap { interactive =>
+                  interactive
+                    .chooseOne(
+                      "Found several main classes. Which would you like to run?",
+                      mainClasses.toList
+                    )
+                    .toRight {
+                      SeveralMainClassesFoundError(
+                        ::(mainClasses.head, mainClasses.tail.toList),
+                        commandString,
+                        Nil
+                      )
+                    }
                 }
-            }
+              }
         }
 
       defaultMainClassOpt match {