Merge branch 'main' into update/sbt-scalajs-1.10.0

kitlangton · Apr 8, 2022 · 8f05c44 · 8f05c44
2 parents a098bf6 + 11f179e
commit 8f05c44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.4.3
+version = 3.5.1
 maxColumn = 120
 align.preset = most
 align.multiline = false

diff --git a/build.sbt b/build.sbt
@@ -33,7 +33,7 @@ val sharedSettings = Seq(
 )
 
 val zio1Version        = "1.0.13"
-val zio2Version        = "2.0.0-RC3"
+val zio2Version        = "2.0.0-RC4"
 val zioQueryVersion    = "0.3.0-RC2"
 val catsEffect3Version = "3.3.5"
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.4.6")
 addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"                  % "3.9.12")
 addSbtPlugin("com.github.sbt"     % "sbt-pgp"                       % "2.1.2")
-addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"                  % "0.9.34")
+addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"                  % "0.10.0")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.9.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.2.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")