VirtusLab · Gedochao · Oct 27, 2022 · Oct 14, 2022 · Oct 14, 2022 · Oct 14, 2022
diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/AboutOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/AboutOptions.scala
@@ -1,23 +1,23 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 
+import scala.cli.commands.common.HasLoggingOptions
 import scala.cli.signing.shared.PasswordOption
-import scala.cli.signing.util.ArgParsers._
+import scala.cli.signing.util.ArgParsers.*
 
 // format: off
 @HelpMessage("Print details about this application")
 final case class AboutOptions(
   @Recurse
-    verbosity: VerbosityOptions = VerbosityOptions(),
+    logging: LoggingOptions = LoggingOptions(),
   @Hidden
   @HelpMessage(HelpMessages.passwordOption)
     ghToken: Option[PasswordOption] = None
-)
+) extends HasLoggingOptions
 // format: on
 
-
 object AboutOptions {
   implicit lazy val parser: Parser[AboutOptions] = Parser.derive
-  implicit lazy val help: Help[AboutOptions]   = Help.derive
+  implicit lazy val help: Help[AboutOptions]     = Help.derive
 }
diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/AddPathOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/AddPathOptions.scala
@@ -1,19 +1,16 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 // format: off
 final case class AddPathOptions(
   @Recurse
-    verbosityOptions: VerbosityOptions = VerbosityOptions(),
-  @Group("Logging")
-  @Name("q")
-    quiet: Boolean = false,
+    logging: LoggingOptions = LoggingOptions(),
   title: String = ""
-) {
-  // format: on
-  lazy val verbosity = verbosityOptions.verbosity - (if (quiet) 1 else 0)
-}
+) extends HasLoggingOptions
+// format: on
 
 object AddPathOptions {
   implicit lazy val parser: Parser[AddPathOptions] = Parser.derive

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/BenchmarkingOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/BenchmarkingOptions.scala
@@ -1,6 +1,6 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 
 // format: off
 final case class BenchmarkingOptions(

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/BloopExitOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/BloopExitOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 
 // format: off
@@ -13,7 +15,7 @@ final case class BloopExitOptions(
     directories: SharedDirectoriesOptions = SharedDirectoriesOptions(),
   @Recurse
     coursier: CoursierOptions = CoursierOptions()
-)
+) extends HasLoggingOptions
 // format: on
 
 object BloopExitOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/BloopStartOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/BloopStartOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 // format: off
 final case class BloopStartOptions(
@@ -16,11 +18,10 @@ final case class BloopStartOptions(
     coursier: CoursierOptions = CoursierOptions(),
   @Name("f")
     force: Boolean = false
-)
+) extends HasLoggingOptions
 // format: on
 
 object BloopStartOptions {
-
   implicit lazy val parser: Parser[BloopStartOptions] = Parser.derive
   implicit lazy val help: Help[BloopStartOptions]     = Help.derive
 }
diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/BspOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/BspOptions.scala
@@ -1,19 +1,21 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasSharedOptions
 
 // format: off
 @HelpMessage("Start BSP server")
 final case class BspOptions(
   // FIXME There might be too many options in SharedOptions for the bsp command…
   @Recurse
     shared: SharedOptions = SharedOptions(),
-  
+
   @HelpMessage("Command-line options JSON file")
   @ValueDescription("path")
   @Hidden
   jsonOptions: Option[String] = None
-) {
+) extends HasSharedOptions {
   // format: on
 }
 

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/CleanOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/CleanOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 // format: off
 @HelpMessage("Clean the workspace")
@@ -13,7 +15,7 @@ final case class CleanOptions(
     bspFile: SharedBspFileOptions = SharedBspFileOptions(),
   @Recurse
     workspace: SharedWorkspaceOptions = SharedWorkspaceOptions()
-)
+) extends HasLoggingOptions
 // format: on
 
 object CleanOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/CompileOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/CompileOptions.scala
@@ -1,8 +1,10 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 import caseapp.core.help.Help
 
+import scala.cli.commands.common.HasSharedOptions
+
 // format: off
 @HelpMessage("Compile Scala code")
 final case class CompileOptions(
@@ -20,7 +22,7 @@ final case class CompileOptions(
 
   @HelpMessage("Compile test scope")
     test: Boolean = false
-)
+) extends HasSharedOptions
   // format: on
 
 object CompileOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/CoursierOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/CoursierOptions.scala
@@ -1,8 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
-import com.github.plokhotnyuk.jsoniter_scala.core._
-import com.github.plokhotnyuk.jsoniter_scala.macros._
+import caseapp.*
+import com.github.plokhotnyuk.jsoniter_scala.core.*
+import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
 // format: off
 final case class CoursierOptions(

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/CrossOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/CrossOptions.scala
@@ -1,6 +1,6 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 
 // format: off
 final case class CrossOptions(

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/DefaultOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/DefaultOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasSharedOptions
 
 // format: off
 case class DefaultOptions(
@@ -12,7 +14,7 @@ case class DefaultOptions(
     sharedRepl: SharedReplOptions = SharedReplOptions(),
   @Name("-version")
     version: Boolean = false
-)
+) extends HasSharedOptions
 // format: on
 
 object DefaultOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/DependencyUpdateOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/DependencyUpdateOptions.scala
@@ -1,8 +1,10 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 import caseapp.core.help.Help
 
+import scala.cli.commands.common.HasSharedOptions
+
 // format: off
 @HelpMessage("Update dependencies in project")
 final case class DependencyUpdateOptions(
@@ -11,7 +13,7 @@ final case class DependencyUpdateOptions(
   @Group("DependencyUpdate")
   @HelpMessage("Update all dependencies if newer version was released")
     all: Boolean = false,
-)
+) extends HasSharedOptions
   // format: on
 
 object DependencyUpdateOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/DirectoriesOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/DirectoriesOptions.scala
@@ -1,15 +1,17 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 // format: off
 @HelpMessage("Prints directories used by `scala-cli`")
 final case class DirectoriesOptions(
   @Recurse
     directories: SharedDirectoriesOptions = SharedDirectoriesOptions(),
   @Recurse
-    verbosity: VerbosityOptions = VerbosityOptions()
-)
+    logging: LoggingOptions = LoggingOptions()
+) extends HasLoggingOptions
 // format: on
 
 object DirectoriesOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/DocOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/DocOptions.scala
@@ -1,8 +1,10 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 import caseapp.core.help.Help
 
+import scala.cli.commands.common.HasSharedOptions
+
 // format: off
 @HelpMessage("Generate Scaladoc documentation", "By default, Scala CLI sets common scaladoc options and this mechanism can be disabled by using `--default-scaladoc-opts:false`.")
 final case class DocOptions(
@@ -20,7 +22,7 @@ final case class DocOptions(
   @HelpMessage("Control if scala CLI should use default options for scaladoc, true by default. Use `--default-scaladoc-opts:false` to not include default options.")
   @ExtraName("defaultScaladocOpts")
     defaultScaladocOptions: Option[Boolean] = None,
-)
+) extends HasSharedOptions
 // format: on
 
 object DocOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/DoctorOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/DoctorOptions.scala
@@ -1,19 +1,20 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 
+import scala.cli.commands.common.HasLoggingOptions
 import scala.cli.signing.shared.PasswordOption
-import scala.cli.signing.util.ArgParsers._
+import scala.cli.signing.util.ArgParsers.*
 
 // format: off
 @HelpMessage("Print details about this application")
 final case class DoctorOptions(
   @Recurse
-    verbosity: VerbosityOptions = VerbosityOptions(),
+    logging: LoggingOptions = LoggingOptions(),
   @Hidden
   @HelpMessage(HelpMessages.passwordOption)
     ghToken: Option[PasswordOption] = None
-)
+) extends HasLoggingOptions
 // format: on
 
 object DoctorOptions {

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/ExportOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/ExportOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasSharedOptions
 
 // format: off
 @HelpMessage("Export current project to sbt or Mill")
@@ -24,7 +26,7 @@ final case class ExportOptions(
   @Name("o")
   @Group("Build Tool export options")
     output: Option[String] = None
-)
+) extends HasSharedOptions
 // format: on
 object ExportOptions {
   implicit lazy val parser: Parser[ExportOptions] = Parser.derive

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/FmtOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/FmtOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasSharedOptions
 
 // format: off
 @HelpMessage("Format Scala code")
@@ -58,7 +60,7 @@ final case class FmtOptions(
   @HelpMessage("Pass scalafmt version before running it. This overrides whatever value is configured in the .scalafmt.conf file.")
   @Name("fmtVersion")
     scalafmtVersion: Option[String] = None
-)
+) extends HasSharedOptions
 // format: on
 object FmtOptions {
   implicit lazy val parser: Parser[FmtOptions] = Parser.derive

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/HelpGroupOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/HelpGroupOptions.scala
@@ -1,9 +1,9 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 import caseapp.core.help.{Help, HelpFormat}
-import com.github.plokhotnyuk.jsoniter_scala.core._
-import com.github.plokhotnyuk.jsoniter_scala.macros._
+import com.github.plokhotnyuk.jsoniter_scala.core.*
+import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
 @HelpMessage("Print help message")
 case class HelpGroupOptions(

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/HelpOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/HelpOptions.scala
@@ -1,9 +1,16 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
 
+import scala.cli.commands.common.HasLoggingOptions
+
+// format: off
 @HelpMessage("Print help message")
-case class HelpOptions()
+case class HelpOptions(
+  @Recurse
+    logging: LoggingOptions = LoggingOptions()
+) extends HasLoggingOptions
+// format: on
 
 object HelpOptions {
   implicit lazy val parser: Parser[HelpOptions] = Parser.derive

diff --git a/modules/cli-options/src/main/scala/scala/cli/commands/InstallCompletionsOptions.scala b/modules/cli-options/src/main/scala/scala/cli/commands/InstallCompletionsOptions.scala
@@ -1,6 +1,8 @@
 package scala.cli.commands
 
-import caseapp._
+import caseapp.*
+
+import scala.cli.commands.common.HasLoggingOptions
 
 // format: off
 @HelpMessage("Installs completions into your shell")
@@ -31,7 +33,7 @@ final case class InstallCompletionsOptions(
 
   @HelpMessage("Print completions to stdout")
     env: Boolean = false,
-)
+) extends HasLoggingOptions
 // format: on
 
 object InstallCompletionsOptions {