Move cli options to cli module

Author: alexarchambault

build.sc

@@ -40,7 +40,6 @@ implicit def millModuleBasePath: define.BasePath =
 object cli extends Cli
 
 object `specification-level` extends SpecificationLevel
-object `cli-options`         extends CliOptions
 object `build-macros`        extends BuildMacros
 object config                extends Cross[Config](Scala.all: _*)
 object options               extends Options
@@ -652,77 +651,50 @@ trait SpecificationLevel extends SbtModule with ScalaCliPublishModule {
   def scalaVersion = Scala.defaultInternal
 }
 
-trait CliOptions extends SbtModule with ScalaCliPublishModule {
-  def scalacOptions = T {
-    val sv         = scalaVersion()
-    val isScala213 = sv.startsWith("2.13.")
-    val extraOptions =
-      if (isScala213) Seq("-Xsource:3")
-      else Nil
-    super.scalacOptions() ++ extraOptions
-  }
-  def moduleDeps = Seq(
-    `specification-level`
-  )
-  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"
@@ -767,9 +739,9 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
   }
   def moduleDeps = Seq(
     `build-module`,
-    `cli-options`,
     config(Scala.scala3),
-    `scala3-graal`(Scala.scala3)
+    `scala3-graal`(Scala.scala3),
+    `specification-level`
   )
 
   def repositories = super.repositories ++ customRepositories

modules/cli-options/src/main/scala/scala/cli/commands/common/HasLoggingOptions.scala

@@ -6,6 +6,7 @@ import caseapp.core.help.{Help, RuntimeCommandsHelp}
 import java.nio.file.InvalidPathException
 
 import scala.cli.commands._
+import scala.cli.commands.shared.ScalaCliHelp
 
 class ScalaCliCommands(
   val progName: String,

modules/cli/src/main/scala/scala/cli/ScalaCliCommands.scala

@@ -4,7 +4,7 @@ import caseapp.*
 import caseapp.core.help.RuntimeCommandsHelp
 
 import scala.build.Logger
-import scala.cli.ScalaCliHelp
+import scala.cli.commands.shared.{HelpOptions, ScalaCliHelp}
 
 class HelpCmd(actualHelp: => RuntimeCommandsHelp) extends ScalaCommand[HelpOptions] {
   override def names                   = List(List("help"))

modules/cli/src/main/scala/scala/cli/commands/HelpCmd.scala

@@ -16,7 +16,7 @@ import scala.build.errors.BuildException
 import scala.build.internal.{Constants, Runner}
 import scala.build.options.{BuildOptions, Scope}
 import scala.build.{Artifacts, Logger, Positioned, ReplArtifacts}
-import scala.cli.commands.common.HasLoggingOptions
+import scala.cli.commands.shared.{HasLoggingOptions, ScalacOptions, SharedOptions}
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.ScalacOptionsUtil.*
 import scala.cli.commands.util.SharedOptionsUtil.*

modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala

@@ -8,7 +8,7 @@ import scala.cli.CurrentParams
 import scala.cli.commands.update.Update
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.version.Version
-import scala.cli.commands.{AboutOptions, CommandUtils, ScalaCommand}
+import scala.cli.commands.{CommandUtils, ScalaCommand}
 
 object About extends ScalaCommand[AboutOptions] {
 

modules/cli/src/main/scala/scala/cli/commands/about/About.scala

@@ -1,8 +1,9 @@
-package scala.cli.commands
+package scala.cli.commands.about
 
 import caseapp.*
 
-import scala.cli.commands.common.HasLoggingOptions
+import scala.cli.commands.shared.{HasLoggingOptions, HelpMessages, LoggingOptions}
+import scala.cli.commands.tags
 import scala.cli.signing.shared.PasswordOption
 import scala.cli.signing.util.ArgParsers.*
 

modules/cli-options/src/main/scala/scala/cli/commands/AboutOptions.scala renamed to modules/cli/src/main/scala/scala/cli/commands/about/AboutOptions.scala

@@ -8,7 +8,7 @@ import java.io.File
 import scala.build.Logger
 import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps.*
-import scala.cli.commands.{AddPathOptions, CustomWindowsEnvVarUpdater, ScalaCommand}
+import scala.cli.commands.{CustomWindowsEnvVarUpdater, ScalaCommand}
 import scala.util.Properties
 
 object AddPath extends ScalaCommand[AddPathOptions] {

modules/cli/src/main/scala/scala/cli/commands/addpath/AddPath.scala

@@ -1,8 +1,8 @@
-package scala.cli.commands
+package scala.cli.commands.addpath
 
 import caseapp.*
 
-import scala.cli.commands.common.HasLoggingOptions
+import scala.cli.commands.shared.{HasLoggingOptions, LoggingOptions}
 
 // format: off
 final case class AddPathOptions(

modules/cli-options/src/main/scala/scala/cli/commands/AddPathOptions.scala renamed to modules/cli/src/main/scala/scala/cli/commands/addpath/AddPathOptions.scala

@@ -8,10 +8,11 @@ import scala.build.blooprifle.internal.{Constants, Operations}
 import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
 import scala.build.internal.OsLibc
 import scala.cli.CurrentParams
+import scala.cli.commands.ScalaCommand
+import scala.cli.commands.shared.{LoggingOptions, SharedOptions}
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
 import scala.cli.commands.util.SharedOptionsUtil.*
-import scala.cli.commands.{LoggingOptions, ScalaCommand, SharedOptions}
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration