Skip to content

Commit b40ced6

Browse files
authored
Merge pull request #109 from massimosiani/library-bumps
Library bumps
2 parents 46d8cb9 + 5c74716 commit b40ced6

File tree

8 files changed

+22
-24
lines changed

8 files changed

+22
-24
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ target/
55
lib_managed/
66
src_managed/
77
project/boot/
8-
project/plugins/project/
8+
project/project/project/
99
.history
1010
.cache
1111
.lib/

.scalafmt.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ align {
1212
assumeStandardLibraryStripMargin = true
1313
continuationIndent.defnSite = 2
1414
continuationIndent.callSite = 2
15-
danglingParentheses = true
15+
danglingParentheses.preset = true
1616
docstrings = JavaDoc
17-
indentOperator = spray
17+
indentOperator.preset = spray
1818
maxColumn = 110
1919
project {
2020
git = true

build.sbt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import microsites.MicrositesPlugin.autoImport.micrositeDescription
22

3-
val scala213Version = "2.13.8"
3+
val scala213Version = "2.13.10"
44
val scala3Version = "3.3.0"
55

66
val scalaVersions = Seq(scala213Version, scala3Version)
@@ -47,12 +47,12 @@ val common = Seq(
4747
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full),
4848
).filterNot(_ => scalaVersion.value.startsWith("3.")),
4949
libraryDependencies ++= Seq(
50-
"org.typelevel" %% "cats-core" % "2.7.0",
51-
"org.typelevel" %% "cats-effect" % "3.3.5",
50+
"org.typelevel" %% "cats-core" % "2.10.0",
51+
"org.typelevel" %% "cats-effect" % "3.5.1",
5252
"org.scalameta" %% "munit" % "0.7.29" % Test,
53-
"org.scalacheck" %% "scalacheck" % "1.15.4" % Test,
53+
"org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
5454
"org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
55-
"org.typelevel" %% "scalacheck-effect-munit" % "1.0.3" % Test
55+
"org.typelevel" %% "scalacheck-effect-munit" % "1.0.4" % Test
5656
)
5757
)
5858

@@ -62,14 +62,13 @@ lazy val metricsCommon = projectMatrix
6262
.enablePlugins(GitVersioning)
6363
.settings(common :+ (name := "natchez-extras-metrics"))
6464

65-
6665
val log4catsVersion = "2.6.0"
6766
val natchezVersion = "0.3.3"
68-
val http4sMilestoneVersion = "1.0.0-M38"
69-
val http4sStableVersion = "0.23.14"
70-
val circeVersion = "0.14.1"
71-
val slf4jVersion = "1.7.35"
72-
val fs2Version = "3.2.4"
67+
val http4sMilestoneVersion = "1.0.0-M40"
68+
val http4sStableVersion = "0.23.23"
69+
val circeVersion = "0.14.3"
70+
val slf4jVersion = "1.7.36"
71+
val fs2Version = "3.8.0"
7372
val doobieVersion = "1.0.0-RC2"
7473

7574
lazy val natchezDatadog = projectMatrix
@@ -187,7 +186,7 @@ lazy val natchezFs2 = projectMatrix
187186
.settings(common :+ (name := "natchez-extras-fs2"))
188187
.settings(
189188
libraryDependencies ++= Seq(
190-
"org.typelevel" %% "kittens" % "3.0.0-M4",
189+
"org.typelevel" %% "kittens" % "3.0.0",
191190
"org.tpolecat" %% "natchez-core" % natchezVersion,
192191
"co.fs2" %% "fs2-core" % fs2Version
193192
)

natchez-extras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/SpanIdentifiersTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SpanIdentifiersTest extends CatsEffectSuite {
3333
}
3434

3535
test("fromKernel should succeed in converting from a kernel even if info is missing") {
36-
assertIOBoolean(fromKernel[IO](Kernel(Map.empty)).attempt.map(_.isRight))
36+
assertIOBoolean(fromKernel[IO](Kernel(Map.empty)).attempt.map(_.isRight)) *>
3737
assertIO(fromKernel[IO](Kernel(Map(ci"X-Trace-Token" -> "foo"))).map(_.traceToken), "foo")
3838
}
3939

natchez-extras-doobie/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class TracedTransactorTest extends CatsEffectSuite {
6464
}
6565

6666
database.test("Trace updates") { db =>
67-
case class Test(name: String, age: Int)
6867
val create = sql"CREATE TABLE a (id INT, name VARCHAR)".update.run
6968
val insert = sql"INSERT INTO a VALUES (${2: Int}, ${"abc": String})".update.run
7069
assertIO(
@@ -74,7 +73,6 @@ class TracedTransactorTest extends CatsEffectSuite {
7473
}
7574

7675
database.test("Trace updates with commented name") { db =>
77-
case class Test(name: String, age: Int)
7876
val create = sql"CREATE TABLE a (id INT, name VARCHAR)".update.run
7977
val insert =
8078
sql"""-- Name: createNewA

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.3
1+
sbt.version=1.9.3

project/plugins.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
22
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
3-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
3+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
44
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
5-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2")
6-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
7-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
5+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
6+
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
7+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
88
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
99
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
10-
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")
10+
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")

project/project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 commit comments

Comments
 (0)