Skip to content

Commit 488f871

Browse files
committed
Update to scala 3
1 parent c2b2b8d commit 488f871

File tree

9 files changed

+21
-20
lines changed

9 files changed

+21
-20
lines changed

Diff for: build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ lazy val compileOptions: Seq[Setting[_]] = Seq(
4747

4848
lazy val packagerProjectSettings = Seq(
4949
name := "scala-packager",
50-
scalaVersion := ScalaVersions.scala213,
50+
scalaVersion := ScalaVersions.scala3,
5151
crossScalaVersions := ScalaVersions.all
5252
)
5353

5454
lazy val imageResizerProjectSettings = Seq(
5555
name := "scala-packager-image-resizer",
56-
scalaVersion := ScalaVersions.scala213,
56+
scalaVersion := ScalaVersions.scala3,
5757
crossScalaVersions := ScalaVersions.all
5858
)
5959

6060
lazy val cliProjectSettings = Seq(
6161
name := "scala-packager-cli",
62-
scalaVersion := ScalaVersions.scala213,
62+
scalaVersion := ScalaVersions.scala3,
6363
crossScalaVersions := ScalaVersions.all,
6464
libraryDependencies ++= Seq(Deps.caseApp)
6565
)

Diff for: modules/cli/src/main/scala/packager/cli/commands/BuildOptions.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package packager.cli.commands
22

3-
import caseapp.{Group, HelpMessage, Name, Parser, Recurse}
4-
import caseapp.core.help.Help
3+
import caseapp._
54
import packager.cli.commands.BuildOptions.PackagerType
65
import packager.config._
76

@@ -109,6 +108,6 @@ object BuildOptions {
109108
case object Rpm extends NativePackagerType
110109
}
111110

112-
implicit val parser: Parser[BuildOptions] = Parser[BuildOptions]
113-
implicit val help: Help[BuildOptions] = Help[BuildOptions]
111+
implicit lazy val parser: Parser[BuildOptions] = Parser.derive
112+
implicit lazy val help: Help[BuildOptions] = Help.derive
114113
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/DebianOptions.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package packager.cli.commands
22

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

5657
case object DebianOptions {
5758

58-
implicit val parser: Parser[DebianOptions] = Parser[DebianOptions]
59-
implicit val help: Help[DebianOptions] = Help[DebianOptions]
59+
implicit lazy val parser: Parser[DebianOptions] = Parser.derive
60+
implicit lazy val help: Help[DebianOptions] = Help.derive
6061

6162
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/DockerOptions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ final case class DockerOptions(
5959

6060
case object DockerOptions {
6161

62-
implicit val parser: Parser[DockerOptions] = Parser[DockerOptions]
63-
implicit val help: Help[DockerOptions] = Help[DockerOptions]
62+
implicit lazy val parser: Parser[DockerOptions] = Parser.derive
63+
implicit lazy val help: Help[DockerOptions] = Help.derive
6464

6565
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/MacOSOptions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final case class MacOSOptions(
2323

2424
case object MacOSOptions {
2525

26-
implicit val parser: Parser[MacOSOptions] = Parser[MacOSOptions]
27-
implicit val help: Help[MacOSOptions] = Help[MacOSOptions]
26+
implicit lazy val parser: Parser[MacOSOptions] = Parser.derive
27+
implicit lazy val help: Help[MacOSOptions] = Help.derive
2828

2929
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/RedHatOptions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final case class RedHatOptions(
4141

4242
case object RedHatOptions {
4343

44-
implicit val parser: Parser[RedHatOptions] = Parser[RedHatOptions]
45-
implicit val help: Help[RedHatOptions] = Help[RedHatOptions]
44+
implicit lazy val parser: Parser[RedHatOptions] = Parser.derive
45+
implicit lazy val help: Help[RedHatOptions] = Help.derive
4646

4747
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/SharedOptions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ final case class SharedOptions(
3333
)
3434
case object SharedOptions {
3535

36-
implicit val parser: Parser[SharedOptions] = Parser[SharedOptions]
37-
implicit val help: Help[SharedOptions] = Help[SharedOptions]
36+
implicit lazy val parser: Parser[SharedOptions] = Parser.derive
37+
implicit lazy val help: Help[SharedOptions] = Help.derive
3838
}

Diff for: modules/cli/src/main/scala/packager/cli/commands/WindowsOptions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ final case class WindowsOptions(
6363

6464
case object WindowsOptions {
6565

66-
implicit val parser: Parser[WindowsOptions] = Parser[WindowsOptions]
67-
implicit val help: Help[WindowsOptions] = Help[WindowsOptions]
66+
implicit lazy val parser: Parser[WindowsOptions] = Parser.derive
67+
implicit lazy val help: Help[WindowsOptions] = Help.derive
6868
}

Diff for: project/ScalaVersions.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
object ScalaVersions {
22
def scala212 = "2.12.18"
33
def scala213 = "2.13.11"
4-
def all = Seq(scala213, scala212)
4+
def scala3 = "3.3.1"
5+
def all = Seq(scala3, scala213, scala212)
56
}

0 commit comments

Comments
 (0)