Update sbt, scala and libs

Author: programaker

build.sbt

@@ -1,13 +1,14 @@
-val ScalaV = "2.13.4"
 val JoguinV = "2.0"
 
-val CatsV = "2.3.0"
-val CatsEffectV = "2.3.0"
-val RefinedV = "0.9.18"
+val ScalaV = "2.13.5"
+
+val CatsV = "2.6.0"
+val CatsEffectV = "3.1.0"
+val RefinedV = "0.9.24"
 val CirceV = "0.13.0"
 val BetterMonadicForV = "0.3.1"
 val KindProjectorV = "0.10.3"
-val ScalaTestV = "3.2.3"
+val ScalaTestV = "3.2.8"
 val ScalatestPlusScalaCheckV = "3.1.1.1"
 val ScalaCheckShapelessV = "1.2.5"
 val CatsScalaCheckV = "0.3.0"
@@ -93,4 +94,4 @@ ThisBuild / scalacOptions ++= Seq(
   "-Ymacro-annotations"
 )
 
-mainClass in assembly := Some("joguin.JoguinApplication")
+assembly / mainClass := Some("joguin.JoguinApplication")

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.4.4
+sbt.version = 1.5.1

src/main/scala/joguin/alien/terraformdevice/PowerGeneratorF.scala

@@ -2,7 +2,7 @@ package joguin.alien.terraformdevice
 
 import cats.InjectK
 import cats.free.Free
-import cats.free.Free.inject
+import cats.free.Free.liftInject
 import joguin.alien.Power
 import joguin.alien.terraformdevice.PowerGeneratorF.GeneratePower
 
@@ -14,7 +14,7 @@ object PowerGeneratorF {
 
 final class PowerGeneratorOps[F[_]](implicit i: InjectK[PowerGeneratorF, F]) {
   def generatePower(min: Power, max: Power): Free[F, Power] =
-    inject(GeneratePower(min, max))
+    liftInject(GeneratePower(min, max))
 }
 
 object PowerGeneratorOps {

src/main/scala/joguin/earth/city/CityRepositoryF.scala

@@ -13,7 +13,7 @@ object CityRepositoryF {
 }
 
 final class CityRepositoryOps[F[_]](implicit i: InjectK[CityRepositoryF, F]) {
-  def findAllCities: Free[F, IdxSeq[City]] = inject(FindAllCities)
+  def findAllCities: Free[F, IdxSeq[City]] = liftInject(FindAllCities)
 }
 
 object CityRepositoryOps {

src/main/scala/joguin/game/progress/GameProgressRepositoryF.scala

@@ -14,9 +14,9 @@ object GameProgressRepositoryF {
 }
 
 final class GameProgressRepositoryOps[F[_]](implicit i: InjectK[GameProgressRepositoryF, F]) {
-  def save(gameProgress: GameProgress): Free[F, Boolean] = inject(Save(gameProgress))
-  def savedProgressExists: Free[F, Boolean] = inject(SavedProgressExists)
-  def restore: Free[F, Option[GameProgress]] = inject(Restore)
+  def save(gameProgress: GameProgress): Free[F, Boolean] = liftInject(Save(gameProgress))
+  def savedProgressExists: Free[F, Boolean] = liftInject(SavedProgressExists)
+  def restore: Free[F, Option[GameProgress]] = liftInject(Restore)
 }
 
 object GameProgressRepositoryOps {

src/main/scala/joguin/playerinteraction/interaction/InteractionF.scala

@@ -15,10 +15,10 @@ object InteractionF {
 
 final class InteractionOps[F[_]](implicit i: InjectK[InteractionF, F]) {
   def writeMessage(message: String): Free[F, Unit] =
-    inject(WriteMessage(message))
+    liftInject(WriteMessage(message))
 
   def readAnswer: Free[F, String] =
-    inject(ReadAnswer)
+    liftInject(ReadAnswer)
 }
 
 object InteractionOps {

src/main/scala/joguin/playerinteraction/message/MessagesF.scala

@@ -26,15 +26,15 @@ object MessagesF {
 
 final class MessagesOps[F[_]](implicit i: InjectK[MessagesF, F]) {
   def getLocalizedMessageSource[T <: MessageSource](source: T): Free[F, LocalizedMessageSource[T]] =
-    inject[MessagesF, F](GetLocalizedMessageSource(source))
+    liftInject[F].apply[MessagesF, LocalizedMessageSource[T]](GetLocalizedMessageSource(source))
 
   def getMessage[T <: MessageSource](source: LocalizedMessageSource[T])(key: T#Key): Free[F, String] =
-    inject[MessagesF, F](GetMessage(source, key))
+    liftInject[F].apply[MessagesF, String](GetMessage(source, key))
 
   def getMessageFmt[T <: MessageSource](
     source: LocalizedMessageSource[T]
   )(key: T#Key, args: List[String]): Free[F, String] =
-    inject[MessagesF, F](GetMessageFmt(source, key, args))
+    liftInject[F].apply[MessagesF, String](GetMessageFmt(source, key, args))
 }
 
 object MessagesOps {

src/main/scala/joguin/playerinteraction/wait/WaitF.scala

@@ -15,7 +15,7 @@ object WaitF {
 
 final class WaitOps[F[_]](implicit i: InjectK[WaitF, F]) {
   def waitFor(duration: FiniteDuration): Free[F, Unit] =
-    inject(WaitFor(duration))
+    liftInject(WaitFor(duration))
 }
 
 object WaitOps {

src/test/scala/joguin/testutil/generators/other/package.scala

@@ -8,7 +8,7 @@ package object other {
   implicit val quitOption: Arbitrary[String] = Arbitrary(genQuitOption)
 
   def genSmallInt: Gen[Int] =
-    Gen.choose(min = 1, max = 10)
+    Gen.choose(min = 1, max = 100)
 
   def genQuitOption: Gen[String] =
     Gen.oneOf("q", "Q")