bump logback & scala versions (#261)

* bump logback & scala versions * fix github ci * bump sbt-scoverage --------- Co-authored-by: Denys Fakhritdinov <dfakhritdinov@evolution.com>
evolution-gaming · Feb 1, 2024 · 6c77ba3 · 6c77ba3
1 parent 462fc38
commit 6c77ba3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,9 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         scala:
-          - 2.13.8
-          - 3.2.0
-          - 2.12.15
+          - 2.13.12
+          - 3.3.0
+          - 2.12.18
 
     steps:
       - uses: actions/checkout@v3

diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@ inThisBuild(Seq(
   startYear := Some(2019),
   licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))),
 
-  crossScalaVersions := Seq("2.13.8", "3.2.0", "2.12.15"),
+  crossScalaVersions := Seq("2.13.12", "3.3.0", "2.12.18"),
 
   versionScheme := Some("semver-spec"),
 

diff --git a/core/src/main/scala/com/evolutiongaming/catshelper/GroupWithin.scala b/core/src/main/scala/com/evolutiongaming/catshelper/GroupWithin.scala
@@ -24,7 +24,7 @@ object GroupWithin {
 
   def empty[F[_]]: GroupWithin[F] = new GroupWithin[F] {
 
-    def apply[A](settings: Settings)(f: Nel[A] => F[Unit]) = {
+    def apply[A](settings: Settings)(f: Nel[A] => F[Unit]): Resource[F, Enqueue[F, A]] = {
       val enqueue = new Enqueue[F, A] {
         def apply(a: A) = f(Nel.of(a))
       }

diff --git a/core/src/main/scala/com/evolutiongaming/catshelper/ToFuture.scala b/core/src/main/scala/com/evolutiongaming/catshelper/ToFuture.scala
@@ -28,7 +28,7 @@ object ToFuture {
 
   implicit def ioToFuture(implicit runtime: IORuntime): ToFuture[IO] = new ToFuture[IO] {
     def apply[A](fa: IO[A]) = {
-      Try(fa.syncStep.unsafeRunSync()) match {
+      Try(fa.syncStep(Int.MaxValue).unsafeRunSync()) match {
         case Success(Left(computation)) =>
           computation.unsafeToFuture()
         case Success(Right(value)) =>

diff --git a/core/src/main/scala/com/evolutiongaming/catshelper/ToTry.scala b/core/src/main/scala/com/evolutiongaming/catshelper/ToTry.scala
@@ -41,7 +41,7 @@ object ToTry {
 
       for {
         a <- Try {
-          fa.syncStep.unsafeRunSync() match {
+          fa.syncStep(Int.MaxValue).unsafeRunSync() match {
             case Left(computation) =>
               computation.unsafeRunTimed(timeout)
             case Right(value) =>
@@ -58,7 +58,7 @@ object ToTry {
 
 
   implicit val idToTry: ToTry[Id] = new ToTry[Id] {
-    def apply[A](fa: Id[A]) = Success(fa)
+    def apply[A](fa: Id[A]): Try[A] = Success(fa)
   }
 
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
   val `slf4j-api` = "org.slf4j" % "slf4j-api" % "2.0.5"
 
   object Logback {
-    val classic = "ch.qos.logback" % "logback-classic" % "1.4.5"
+    val classic = "ch.qos.logback" % "logback-classic" % "1.4.14"
   }
 
   object Cats {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.9")
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,9 +11,9 @@ jobs: @@
           fail-fast: false
           matrix:
             scala:
-              - 2.13.8
-              - 3.2.0
-              - 2.12.15
+              - 2.13.12
+              - 3.3.0
+              - 2.12.18
         steps:
           - uses: actions/checkout@v3
@@ Expand Down @@