Skip to content

Commit

Permalink
Update to scala 3
Browse files Browse the repository at this point in the history
  • Loading branch information
lwronski committed Sep 27, 2023
1 parent c2b2b8d commit 488f871
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ lazy val compileOptions: Seq[Setting[_]] = Seq(

lazy val packagerProjectSettings = Seq(
name := "scala-packager",
scalaVersion := ScalaVersions.scala213,
scalaVersion := ScalaVersions.scala3,
crossScalaVersions := ScalaVersions.all
)

lazy val imageResizerProjectSettings = Seq(
name := "scala-packager-image-resizer",
scalaVersion := ScalaVersions.scala213,
scalaVersion := ScalaVersions.scala3,
crossScalaVersions := ScalaVersions.all
)

lazy val cliProjectSettings = Seq(
name := "scala-packager-cli",
scalaVersion := ScalaVersions.scala213,
scalaVersion := ScalaVersions.scala3,
crossScalaVersions := ScalaVersions.all,
libraryDependencies ++= Seq(Deps.caseApp)
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package packager.cli.commands

import caseapp.{Group, HelpMessage, Name, Parser, Recurse}
import caseapp.core.help.Help
import caseapp._
import packager.cli.commands.BuildOptions.PackagerType
import packager.config._

Expand Down Expand Up @@ -109,6 +108,6 @@ object BuildOptions {
case object Rpm extends NativePackagerType
}

implicit val parser: Parser[BuildOptions] = Parser[BuildOptions]
implicit val help: Help[BuildOptions] = Help[BuildOptions]
implicit lazy val parser: Parser[BuildOptions] = Parser.derive
implicit lazy val help: Help[BuildOptions] = Help.derive
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package packager.cli.commands

import caseapp.core.help.Help
import caseapp.core.parser.Parser
import caseapp.{Group, HelpMessage, Parser, ValueDescription}
import packager.cli.commands.SettingsHelpers.Mandatory
import packager.config.{DebianSettings, SharedSettings}
Expand Down Expand Up @@ -55,7 +56,7 @@ final case class DebianOptions(

case object DebianOptions {

implicit val parser: Parser[DebianOptions] = Parser[DebianOptions]
implicit val help: Help[DebianOptions] = Help[DebianOptions]
implicit lazy val parser: Parser[DebianOptions] = Parser.derive
implicit lazy val help: Help[DebianOptions] = Help.derive

}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ final case class DockerOptions(

case object DockerOptions {

implicit val parser: Parser[DockerOptions] = Parser[DockerOptions]
implicit val help: Help[DockerOptions] = Help[DockerOptions]
implicit lazy val parser: Parser[DockerOptions] = Parser.derive
implicit lazy val help: Help[DockerOptions] = Help.derive

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final case class MacOSOptions(

case object MacOSOptions {

implicit val parser: Parser[MacOSOptions] = Parser[MacOSOptions]
implicit val help: Help[MacOSOptions] = Help[MacOSOptions]
implicit lazy val parser: Parser[MacOSOptions] = Parser.derive
implicit lazy val help: Help[MacOSOptions] = Help.derive

}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ final case class RedHatOptions(

case object RedHatOptions {

implicit val parser: Parser[RedHatOptions] = Parser[RedHatOptions]
implicit val help: Help[RedHatOptions] = Help[RedHatOptions]
implicit lazy val parser: Parser[RedHatOptions] = Parser.derive
implicit lazy val help: Help[RedHatOptions] = Help.derive

}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ final case class SharedOptions(
)
case object SharedOptions {

implicit val parser: Parser[SharedOptions] = Parser[SharedOptions]
implicit val help: Help[SharedOptions] = Help[SharedOptions]
implicit lazy val parser: Parser[SharedOptions] = Parser.derive
implicit lazy val help: Help[SharedOptions] = Help.derive
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ final case class WindowsOptions(

case object WindowsOptions {

implicit val parser: Parser[WindowsOptions] = Parser[WindowsOptions]
implicit val help: Help[WindowsOptions] = Help[WindowsOptions]
implicit lazy val parser: Parser[WindowsOptions] = Parser.derive
implicit lazy val help: Help[WindowsOptions] = Help.derive
}
3 changes: 2 additions & 1 deletion project/ScalaVersions.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
object ScalaVersions {
def scala212 = "2.12.18"
def scala213 = "2.13.11"
def all = Seq(scala213, scala212)
def scala3 = "3.3.1"
def all = Seq(scala3, scala213, scala212)
}

0 comments on commit 488f871

Please sign in to comment.