Merge pull request #1568 from alexarchambault/case-app-scala-3

Switch to Scala 3-based case-app

Author: alexarchambault

build.sc

@@ -647,9 +647,8 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule {
   def compileIvyDeps = super.compileIvyDeps() ++ Seq(
     Deps.jsoniterMacros
   )
-  private def scalaVer = Scala.scala213
-  def scalaVersion     = scalaVer
-  def repositories     = super.repositories ++ customRepositories
+  def scalaVersion = Scala.defaultInternal
+  def repositories = super.repositories ++ customRepositories
 
   def constantsFile = T.persistent {
     val dir  = T.dest / "constants"
@@ -750,6 +749,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
   def repositories = super.repositories ++ customRepositories
 
   def ivyDeps = super.ivyDeps() ++ Agg(
+    Deps.caseApp,
     Deps.coursierLauncher,
     Deps.coursierProxySetup,
     Deps.coursierPublish.exclude((organization, "config_2.13")),

modules/cli-options/src/main/scala/scala/cli/commands/BenchmarkingOptions.scala

@@ -15,7 +15,6 @@ final case class BenchmarkingOptions(
 // format: on
 
 object BenchmarkingOptions {
-  lazy val parser: Parser[BenchmarkingOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[BenchmarkingOptions, parser.D] = parser
-  implicit lazy val help: Help[BenchmarkingOptions]                      = Help.derive
+  implicit lazy val parser: Parser[BenchmarkingOptions] = Parser.derive
+  implicit lazy val help: Help[BenchmarkingOptions]     = Help.derive
 }

modules/cli-options/src/main/scala/scala/cli/commands/BloopExitOptions.scala

@@ -21,6 +21,4 @@ final case class BloopExitOptions(
 object BloopExitOptions {
   implicit lazy val parser: Parser[BloopExitOptions] = Parser.derive
   implicit lazy val help: Help[BloopExitOptions]     = Help.derive
-  // Parser.Aux for using BloopExitOptions with @Recurse in other options
-  implicit lazy val parserAux: Parser.Aux[BloopExitOptions, parser.D] = parser
 }

modules/cli-options/src/main/scala/scala/cli/commands/CoursierOptions.scala

@@ -24,8 +24,7 @@ final case class CoursierOptions(
 // format: on
 
 object CoursierOptions {
-  lazy val parser: Parser[CoursierOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[CoursierOptions, parser.D] = parser
-  implicit lazy val help: Help[CoursierOptions]                      = Help.derive
-  implicit lazy val jsonCodec: JsonValueCodec[CoursierOptions]       = JsonCodecMaker.make
+  implicit lazy val parser: Parser[CoursierOptions]            = Parser.derive
+  implicit lazy val help: Help[CoursierOptions]                = Help.derive
+  implicit lazy val jsonCodec: JsonValueCodec[CoursierOptions] = JsonCodecMaker.make
 }

modules/cli-options/src/main/scala/scala/cli/commands/CrossOptions.scala

@@ -10,7 +10,6 @@ final case class CrossOptions(
 // format: on
 
 object CrossOptions {
-  lazy val parser: Parser[CrossOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[CrossOptions, parser.D] = parser
-  implicit lazy val help: Help[CrossOptions]                      = Help.derive
+  implicit lazy val parser: Parser[CrossOptions] = Parser.derive
+  implicit lazy val help: Help[CrossOptions]     = Help.derive
 }

modules/cli-options/src/main/scala/scala/cli/commands/DirectoriesOptions.scala

@@ -15,7 +15,6 @@ final case class DirectoriesOptions(
 // format: on
 
 object DirectoriesOptions {
-  lazy val parser: Parser[DirectoriesOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[DirectoriesOptions, parser.D] = parser
-  implicit lazy val help: Help[DirectoriesOptions]                      = Help.derive
+  implicit lazy val parser: Parser[DirectoriesOptions] = Parser.derive
+  implicit lazy val help: Help[DirectoriesOptions]     = Help.derive
 }

modules/cli-options/src/main/scala/scala/cli/commands/HelpGroupOptions.scala

@@ -2,6 +2,7 @@ package scala.cli.commands
 
 import caseapp.*
 import caseapp.core.help.{Help, HelpFormat}
+import caseapp.core.Scala3Helpers.*
 import com.github.plokhotnyuk.jsoniter_scala.core.*
 import com.github.plokhotnyuk.jsoniter_scala.macros.*
 
@@ -40,8 +41,7 @@ case class HelpGroupOptions(
 }
 
 object HelpGroupOptions {
-  lazy val parser: Parser[HelpGroupOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[HelpGroupOptions, parser.D] = parser
-  implicit lazy val help: Help[HelpGroupOptions]                      = Help.derive
-  implicit lazy val jsonCodec: JsonValueCodec[HelpGroupOptions]       = JsonCodecMaker.make
+  implicit lazy val parser: Parser[HelpGroupOptions]            = Parser.derive
+  implicit lazy val help: Help[HelpGroupOptions]                = Help.derive
+  implicit lazy val jsonCodec: JsonValueCodec[HelpGroupOptions] = JsonCodecMaker.make
 }

modules/cli-options/src/main/scala/scala/cli/commands/LoggingOptions.scala

@@ -22,8 +22,7 @@ final case class LoggingOptions(
 }
 
 object LoggingOptions {
-  lazy val parser: Parser[LoggingOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[LoggingOptions, parser.D] = parser
-  implicit lazy val help: Help[LoggingOptions]                      = Help.derive
-  implicit lazy val jsonCodec: JsonValueCodec[LoggingOptions]       = JsonCodecMaker.make
+  implicit lazy val parser: Parser[LoggingOptions]            = Parser.derive
+  implicit lazy val help: Help[LoggingOptions]                = Help.derive
+  implicit lazy val jsonCodec: JsonValueCodec[LoggingOptions] = JsonCodecMaker.make
 }

modules/cli-options/src/main/scala/scala/cli/commands/MainClassOptions.scala

@@ -9,7 +9,7 @@ final case class MainClassOptions(
   @ValueDescription("main-class")
   @Name("M")
     mainClass: Option[String] = None,
-  
+
   @Group("Entrypoint")
   @HelpMessage("List main classes available in the current context")
   @Name("mainClassList")
@@ -20,7 +20,6 @@ final case class MainClassOptions(
 // format: on
 
 object MainClassOptions {
-  lazy val parser: Parser[MainClassOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[MainClassOptions, parser.D] = parser
-  implicit lazy val help: Help[MainClassOptions]                      = Help.derive
+  implicit lazy val parser: Parser[MainClassOptions] = Parser.derive
+  implicit lazy val help: Help[MainClassOptions]     = Help.derive
 }

modules/cli-options/src/main/scala/scala/cli/commands/MarkdownOptions.scala

@@ -13,7 +13,6 @@ final case class MarkdownOptions(
 // format: on
 
 object MarkdownOptions {
-  lazy val parser: Parser[MarkdownOptions]                           = Parser.derive
-  implicit lazy val parserAux: Parser.Aux[MarkdownOptions, parser.D] = parser
-  implicit lazy val help: Help[MarkdownOptions]                      = Help.derive
+  implicit lazy val parser: Parser[MarkdownOptions] = Parser.derive
+  implicit lazy val help: Help[MarkdownOptions]     = Help.derive
 }