Merge pull request #831 from alexarchambault/fix-build

Fix build

Author: romanowski

modules/cli-options/src/main/scala/scala/cli/commands/pgp/DummyOptions.scala

@@ -0,0 +1,10 @@
+package scala.cli.commands.pgp
+
+import caseapp._
+
+final case class DummyOptions()
+
+object DummyOptions {
+  implicit lazy val parser: Parser[DummyOptions] = Parser.derive
+  implicit lazy val help: Help[DummyOptions]     = Help.derive
+}

modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalOptions.scala renamed to modules/cli-options/src/main/scala/scala/cli/commands/pgp/PgpExternalOptions.scala

@@ -4,13 +4,13 @@ import caseapp._
 
 import scala.cli.commands.util.CommandHelpers
 
-abstract class ExternalCommand extends Command[ExternalCommand.DummyOptions] with CommandHelpers {
+abstract class ExternalCommand extends Command[DummyOptions] with CommandHelpers {
   override def hasHelp                 = false
   override def stopAtFirstUnrecognized = true
 
   def actualHelp: Help[_]
 
-  def run(options: ExternalCommand.DummyOptions, args: RemainingArgs): Unit = {
+  def run(options: DummyOptions, args: RemainingArgs): Unit = {
     val unparsedPart =
       if (args.unparsed.isEmpty) Nil
       else Seq("--") ++ args.unparsed
@@ -20,14 +20,3 @@ abstract class ExternalCommand extends Command[ExternalCommand.DummyOptions] wit
 
   def run(args: Seq[String]): Unit
 }
-
-object ExternalCommand {
-
-  final case class DummyOptions()
-
-  object DummyOptions {
-    implicit lazy val parser: Parser[DummyOptions] = Parser.derive
-    implicit lazy val help: Help[DummyOptions]     = Help.derive
-  }
-
-}

modules/cli/src/main/scala/scala/cli/commands/pgp/ExternalCommand.scala

@@ -1,11 +1,15 @@
 package scala.build.options
 
-import scala.deriving.*
 import scala.compiletime.*
+import scala.deriving.*
+
 trait ConfigMonoid[T]:
   def zero: T
   def orElse(main: T, defaults: T): T
 
+  def sum(values: Seq[T]): T =
+    values.foldLeft(zero)(orElse(_, _))
+
 case class ConfigMonoidImpl[T](override val zero: T)(orElseFun: (T, T) => T)
     extends ConfigMonoid[T]:
   def orElse(main: T, defaults: T) = orElseFun(main, defaults)
@@ -19,6 +23,9 @@ object ConfigMonoid:
       def orElse(main: T, defaults: T) = orElseFn(main, defaults)
     }
 
+  def sum[T](values: Seq[T])(implicit monoid: ConfigMonoid[T]): T =
+    monoid.sum(values)
+
   given seq[T]: ConfigMonoid[Seq[T]]       = ConfigMonoidImpl(Nil)(_ ++ _)
   given list[T]: ConfigMonoid[List[T]]     = ConfigMonoidImpl(Nil)(_ ++ _)
   given set[T]: ConfigMonoid[Set[T]]       = ConfigMonoidImpl(Set.empty)(_ ++ _)