Merge branch 'main' into update/sbt-scoverage-2.0.9

geirolz · Nov 12, 2023 · 35ab3e4 · 35ab3e4
2 parents 0371837 + f417a6a
commit 35ab3e4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.15
+81c94432182c2c6b0676dd33f0804c911395e118
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.15
 encoding = "UTF-8"
 runner.dialect = "scala213source3"
 maxColumn = 100

diff --git a/project/ProjectDependencies.scala b/project/ProjectDependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object ProjectDependencies {
 
-  private val catsVersion       = "2.9.0"
+  private val catsVersion       = "2.10.0"
   private val catsEffectVersion = "3.4.1"
   private val munitVersion      = "0.7.29"
 
@@ -13,7 +13,7 @@ object ProjectDependencies {
 
   private val general =
     Seq(
-      "org.typelevel" %% "cats-core" % catsVersion,
+      "org.typelevel" %% "cats-core" % catsVersion
 //      "org.typelevel" %% "cats-effect" % catsEffectVersion
     )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.8.0
+sbt.version = 1.8.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
diff --git a/test/project/ProjectDependencies.scala b/test/project/ProjectDependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object ProjectDependencies {
 
-  private val catsVersion       = "2.9.0"
+  private val catsVersion       = "2.10.0"
   private val catsEffectVersion = "3.4.1"
   private val http4sVersion     = "0.23.16"
   private val tapirVersion      = "1.2.2"

diff --git a/test/project/build.properties b/test/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.0
+sbt.version=1.8.3