Update to izumi 1.2.6, update Scala

7mind · Mar 8, 2024 · 7c31be1 · 7c31be1
1 parent 144f113
commit 7c31be1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 val V = new {
-  val distage       = "1.1.0"
+  val distage       = "1.2.6"
   val logstage      = distage
   val scalatest     = "3.2.18"
   val scalacheck    = "1.17.0"
@@ -47,8 +47,8 @@ val Deps = new {
 
 inThisBuild(
   Seq(
-    crossScalaVersions := Seq("2.13.12", "3.3.3"),
-//    crossScalaVersions := Seq("3.3.3", "2.13.12"), // uncomment to use Scala 3 in IDE
+    crossScalaVersions := Seq("2.13.13", "3.4.0"),
+//    crossScalaVersions := Seq("3.4.0", "2.13.13"), // uncomment to use Scala 3 in IDE
     scalaVersion := crossScalaVersions.value.head,
     version      := "1.0.0",
     organization := "io.7mind",

diff --git a/src/main/scala/leaderboard/LeaderboardRole.scala b/src/main/scala/leaderboard/LeaderboardRole.scala
@@ -292,7 +292,7 @@ object GenericLauncher extends MainBase(Activation(Repo -> Repo.Prod, Scene -> S
 sealed abstract class MainBase(
   activation: Activation,
   requiredRoles: Vector[RawRoleParams],
-) extends RoleAppMain.LauncherBIO2[IO] {
+) extends RoleAppMain.LauncherBIO[IO] {
 
   override def requiredRoles(argv: RoleAppMain.ArgV): Vector[RawRoleParams] = {
     requiredRoles
@@ -313,6 +313,6 @@ sealed abstract class MainBase(
     make[Activation].named("default").fromValue(defaultActivation ++ activation)
   }
 
-  private[this] def defaultActivation = Activation(Scene -> Scene.Provided)
+  private def defaultActivation = Activation(Scene -> Scene.Provided)
 
 }
diff --git a/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala b/src/main/scala/leaderboard/plugins/LeaderboardPlugin.scala
@@ -58,7 +58,7 @@ object LeaderboardPlugin extends PluginDef {
 
       make[Ranks[F]].from[Ranks.Impl[F]]
 
-      make[Http4sDsl[F[Throwable, _]]]
+      makeTrait[Http4sDsl[F[Throwable, _]]]
     }
 
     def repoDummy[F[+_, +_]: TagKK]: ModuleDef = new ModuleDef {

diff --git a/src/test/scala/leaderboard/tests.scala b/src/test/scala/leaderboard/tests.scala
@@ -4,14 +4,14 @@ import distage.{DIKey, ModuleDef, Scene}
 import izumi.distage.model.definition.Activation
 import izumi.distage.model.definition.StandardAxis.Repo
 import izumi.distage.plugins.PluginConfig
-import izumi.distage.testkit.scalatest.{AssertIO3, Spec3}
+import izumi.distage.testkit.scalatest.{AssertZIO, SpecZIO}
 import leaderboard.model.*
 import leaderboard.repo.{Ladder, Profiles}
 import leaderboard.services.Ranks
 import leaderboard.zioenv.*
 import zio.{IO, ZIO}
 
-abstract class LeaderboardTest extends Spec3[ZIO] with AssertIO3[ZIO] {
+abstract class LeaderboardTest extends SpecZIO with AssertZIO {
   override def config = super.config.copy(
     pluginConfig = PluginConfig.cached(packagesEnabled = Seq("leaderboard.plugins")),
     moduleOverrides = super.config.moduleOverrides ++ new ModuleDef {