From 2e00ffa103c3b9417e82e46c670a173908165c8b Mon Sep 17 00:00:00 2001 From: Terry L <8069171+ithinkicancode@users.noreply.github.com> Date: Mon, 16 Jan 2023 23:12:46 -0500 Subject: [PATCH] Migrate to ZIO 2.0 (#460) (#570) * Just keeping deps current. * fixing 2.11 build * update zio to 2.0.6 --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- project/BuildHelper.scala | 2 +- project/build.properties | 2 +- project/plugins.sbt | 28 ++++++++++++++-------------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b48c973..593d7b02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8'] - scala: ['2.11.12', '2.12.15', '2.13.7', '3.1.1'] + scala: ['2.11.12', '2.12.17', '2.13.10', '3.2.0'] steps: - name: Checkout current branch uses: actions/checkout@v3.0.0 diff --git a/build.sbt b/build.sbt index 54626576..c14ee4a3 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ addCommandAlias( ";zioNio/test;examples/test" ) -val zioVersion = "2.0.0" +val zioVersion = "2.0.6" lazy val zioNio = project .in(file("nio")) @@ -28,7 +28,7 @@ lazy val zioNio = project libraryDependencies ++= Seq( "dev.zio" %% "zio" % zioVersion, "dev.zio" %% "zio-streams" % zioVersion, - "org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0", + "org.scala-lang.modules" %% "scala-collection-compat" % "2.9.0", "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test ), diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index ed5c4a50..0e6ffa40 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -26,7 +26,7 @@ object BuildHelper { val Scala212: String = versions("2.12") val Scala213: String = versions("2.13") val Scala3: String = versions("3") - val SilencerVersion = "1.7.8" + val SilencerVersion = "1.7.12" private val stdOptions = Seq( "-deprecation", diff --git a/project/build.properties b/project/build.properties index 8378cad5..f344c148 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.7 +sbt.version = 1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index c2551429..f0875752 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,20 +1,20 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.13") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16") -addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.9.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4") +addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6") addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") -libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.3" +libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6"