Merge pull request #109 from massimosiani/library-bumps

Library bumps
ovotech · Sep 5, 2023 · b40ced6 · b40ced6
2 parents 46d8cb9 + 5c74716
commit b40ced6
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ target/
 lib_managed/
 src_managed/
 project/boot/
-project/plugins/project/
+project/project/project/
 .history
 .cache
 .lib/

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -12,9 +12,9 @@ align {
 assumeStandardLibraryStripMargin = true
 continuationIndent.defnSite = 2
 continuationIndent.callSite = 2
-danglingParentheses = true
+danglingParentheses.preset = true
 docstrings = JavaDoc
-indentOperator = spray
+indentOperator.preset = spray
 maxColumn = 110
 project {
   git = true

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import microsites.MicrositesPlugin.autoImport.micrositeDescription
 
-val scala213Version = "2.13.8"
+val scala213Version = "2.13.10"
 val scala3Version = "3.3.0"
 
 val scalaVersions = Seq(scala213Version, scala3Version)
@@ -47,12 +47,12 @@ val common = Seq(
     compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full),
   ).filterNot(_ => scalaVersion.value.startsWith("3.")),
   libraryDependencies ++= Seq(
-    "org.typelevel" %% "cats-core" % "2.7.0",
-    "org.typelevel" %% "cats-effect" % "3.3.5",
+    "org.typelevel" %% "cats-core" % "2.10.0",
+    "org.typelevel" %% "cats-effect" % "3.5.1",
     "org.scalameta" %% "munit" % "0.7.29" % Test,
-    "org.scalacheck" %% "scalacheck" % "1.15.4" % Test,
+    "org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
     "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
-    "org.typelevel" %% "scalacheck-effect-munit" % "1.0.3" % Test
+    "org.typelevel" %% "scalacheck-effect-munit" % "1.0.4" % Test
   )
 )
 
@@ -62,14 +62,13 @@ lazy val metricsCommon = projectMatrix
   .enablePlugins(GitVersioning)
   .settings(common :+ (name := "natchez-extras-metrics"))
 
-
 val log4catsVersion = "2.6.0"
 val natchezVersion = "0.3.3"
-val http4sMilestoneVersion = "1.0.0-M38"
-val http4sStableVersion = "0.23.14"
-val circeVersion = "0.14.1"
-val slf4jVersion = "1.7.35"
-val fs2Version = "3.2.4"
+val http4sMilestoneVersion = "1.0.0-M40"
+val http4sStableVersion = "0.23.23"
+val circeVersion = "0.14.3"
+val slf4jVersion = "1.7.36"
+val fs2Version = "3.8.0"
 val doobieVersion = "1.0.0-RC2"
 
 lazy val natchezDatadog = projectMatrix
@@ -187,7 +186,7 @@ lazy val natchezFs2 = projectMatrix
   .settings(common :+ (name := "natchez-extras-fs2"))
   .settings(
     libraryDependencies ++= Seq(
-      "org.typelevel" %% "kittens" % "3.0.0-M4",
+      "org.typelevel" %% "kittens" % "3.0.0",
       "org.tpolecat" %% "natchez-core" % natchezVersion,
       "co.fs2" %% "fs2-core" % fs2Version
     )

diff --git a/...ras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/SpanIdentifiersTest.scala b/...ras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/SpanIdentifiersTest.scala
@@ -33,7 +33,7 @@ class SpanIdentifiersTest extends CatsEffectSuite {
   }
 
   test("fromKernel should succeed in converting from a kernel even if info is missing") {
-    assertIOBoolean(fromKernel[IO](Kernel(Map.empty)).attempt.map(_.isRight))
+    assertIOBoolean(fromKernel[IO](Kernel(Map.empty)).attempt.map(_.isRight)) *>
     assertIO(fromKernel[IO](Kernel(Map(ci"X-Trace-Token" -> "foo"))).map(_.traceToken), "foo")
   }
 

diff --git a/...tras-doobie/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala b/...tras-doobie/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala
@@ -64,7 +64,6 @@ class TracedTransactorTest extends CatsEffectSuite {
   }
 
   database.test("Trace updates") { db =>
-    case class Test(name: String, age: Int)
     val create = sql"CREATE TABLE a (id INT, name VARCHAR)".update.run
     val insert = sql"INSERT INTO a VALUES (${2: Int}, ${"abc": String})".update.run
     assertIO(
@@ -74,7 +73,6 @@ class TracedTransactorTest extends CatsEffectSuite {
   }
 
   database.test("Trace updates with commented name") { db =>
-    case class Test(name: String, age: Int)
     val create = sql"CREATE TABLE a (id INT, name VARCHAR)".update.run
     val insert =
       sql"""-- Name: createNewA

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
 addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")