Merge branch 'main' into otel4s

typelevel · May 3, 2024 · 932d3d7 · 932d3d7
2 parents 041bd81 + 2022a01
commit 932d3d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.0
+version = 3.8.1
 maxColumn = 100
 continuationIndent.callSite = 2
 newlines.sometimesBeforeColonInMethodReturnType = false

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/build.sbt b/build.sbt
@@ -86,8 +86,8 @@ val catsEffectV = "3.5.4"
 
 val otel4sV = "0.6.0"
 
-val munitV = "1.0.0-M11"
-val munitCatsEffectV = "2.0.0-M4"
+val munitV = "1.0.0-RC1"
+val munitCatsEffectV = "2.0.0-M5"
 
 val kindProjectorV = "0.13.3"
 val betterMonadicForV = "0.3.1"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
-val sbtTypelevelVersion = "0.6.7"
+val sbtTypelevelVersion = "0.7.0"
 
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.15.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("com.github.cb372"   % "sbt-explicit-dependencies"     % "0.3.1")