diff --git a/.gitignore b/.gitignore index 5e031a7a..33f5a347 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ test-output/ .idea/ .bsp .vscode +.history/ \ No newline at end of file diff --git a/build.sbt b/build.sbt index 4904cbb0..3272d588 100644 --- a/build.sbt +++ b/build.sbt @@ -51,10 +51,10 @@ lazy val root = project unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library") ) -val zioVersion = "2.0.22" -val catsVersion = "2.9.0" +val zioVersion = "2.1.0" +val catsVersion = "2.10.0" val catsEffectVersion = "3.5.4" -val catsMtlVersion = "1.3.0" +val catsMtlVersion = "1.4.0" val disciplineScalaTestVersion = "2.2.0" val fs2Version = "3.10.2" val scalaJavaTimeVersion = "2.5.0" diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index e30569c9..4539d42b 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -7,7 +7,7 @@ import sbtbuildinfo._ import BuildInfoKeys._ object BuildHelper { - val testDeps = Seq("org.scalacheck" %% "scalacheck" % "1.17.0" % Test) + val testDeps = Seq("org.scalacheck" %% "scalacheck" % "1.18.0" % Test) val Scala212 = "2.12.19" val Scala213 = "2.13.13" diff --git a/project/build.properties b/project/build.properties index 04267b14..b485f62c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 5338d18f..b79c4fd5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,3 +9,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.8") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") diff --git a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala index 20116ec9..f308f672 100644 --- a/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala +++ b/zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala @@ -98,7 +98,7 @@ private[zio] trait CatsSpecBase implicit def runtime(implicit ticker: Ticker): Runtime[Any] = { val tickerExecutor = Executor.fromExecutionContext(ticker.ctx) - val fiberId = FiberId.make(Trace.empty)(Unsafe.unsafe) + val fiberId = FiberId.generate(FiberRefs.empty)(Trace.empty)(Unsafe.unsafe) val fiberRefs = FiberRefs.empty .updatedAs(fiberId)(FiberRef.overrideExecutor, Some(tickerExecutor)) .updatedAs(fiberId)(FiberRef.currentBlockingExecutor, tickerExecutor)