Skip to content

Commit 1b4dc63

Browse files
authored
Merge branch 'main' into update/otel4s-core-1.0.0
2 parents 1ed1b55 + dd53b86 commit 1b4dc63

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version = "3.11.0"
1+
version = "3.11.1"
22
runner.dialect = Scala213Source3
33
project.includePaths = [] # disables formatting

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ThisBuild / libraryDependencySchemes +=
7272

7373
// This is used in a couple places
7474
lazy val fs2Version = "3.13.0"
75-
lazy val openTelemetryVersion = "1.55.0"
75+
lazy val openTelemetryVersion = "1.62.0"
7676
lazy val otel4sVersion = "1.0.0"
7777
lazy val otel4sSdkVersion = "0.19.0"
7878
lazy val refinedVersion = "0.11.3"
@@ -127,7 +127,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
127127
"org.typelevel" %%% "cats-effect" % "3.7.0",
128128
"co.fs2" %%% "fs2-core" % fs2Version,
129129
"co.fs2" %%% "fs2-io" % fs2Version,
130-
"org.scodec" %%% "scodec-bits" % "1.2.4",
130+
"org.scodec" %%% "scodec-bits" % "1.2.5",
131131
"org.scodec" %%% "scodec-core" % (if (tlIsScala3.value) "2.3.3" else "1.11.11"),
132132
"org.scodec" %%% "scodec-cats" % "1.3.0",
133133
"org.typelevel" %%% "otel4s-core" % otel4sVersion,
@@ -137,7 +137,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
137137
"org.typelevel" %%% "twiddles-core" % "1.1.0-RC1",
138138
"org.typelevel" %%% "saslprep" % "1.0.0",
139139
) ++ Seq(
140-
"com.beachape" %%% "enumeratum" % "1.9.0",
140+
"com.beachape" %%% "enumeratum" % "1.9.7",
141141
).filterNot(_ => tlIsScala3.value)
142142
).platformsSettings(JSPlatform, NativePlatform)(
143143
libraryDependencies ++= Seq(
@@ -168,8 +168,8 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform)
168168
.settings(
169169
name := "skunk-circe",
170170
libraryDependencies ++= Seq(
171-
"io.circe" %%% "circe-core" % "0.14.14",
172-
"io.circe" %%% "circe-jawn" % "0.14.14"
171+
"io.circe" %%% "circe-core" % "0.14.15",
172+
"io.circe" %%% "circe-jawn" % "0.14.15"
173173
)
174174
)
175175

@@ -263,7 +263,7 @@ lazy val bench = project
263263
.dependsOn(core.jvm)
264264
.settings(commonSettings)
265265
.settings(
266-
libraryDependencies += "org.postgresql" % "postgresql" % "42.7.4"
266+
libraryDependencies += "org.postgresql" % "postgresql" % "42.7.11"
267267
)
268268

269269
lazy val unidocs = project

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ThisBuild / libraryDependencySchemes ++= Seq(
66
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.5")
77
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.5")
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
9-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
9+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
1010
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
1111
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
1212
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")

0 commit comments

Comments
 (0)