From ba58ffe53ec467cf101ed87d6af7cd0ca60646fb Mon Sep 17 00:00:00 2001 From: Denys Fakhritdinov Date: Tue, 30 Jan 2024 15:48:32 +0100 Subject: [PATCH] bump logback & scala versions --- build.sbt | 2 +- .../scala/com/evolutiongaming/catshelper/GroupWithin.scala | 2 +- .../main/scala/com/evolutiongaming/catshelper/ToFuture.scala | 2 +- .../src/main/scala/com/evolutiongaming/catshelper/ToTry.scala | 4 ++-- project/Dependencies.scala | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index a700e6c9..263c3eda 100644 --- 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 index f679550b..a896c11f 100644 --- 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 index ccf3630a..fc194f20 100644 --- 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 index 60abc6b0..700fa8a9 100644 --- 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 index 7624c9cc..7de187b5 100644 --- 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 {