Merge branch 'main' into update/sbt-typelevel-0.7.6

typelevel · Jan 22, 2025 · 1b79850 · 1b79850
2 parents c52a61c + ce63cbe
commit 1b79850
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -41,7 +41,7 @@ lazy val scalaNativeSettings = Def.settings(
 )
 
 val Scala212 = "2.12.20"
-val Scala213 = "2.13.15"
+val Scala213 = "2.13.16"
 ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.4")
 ThisBuild / scalaVersion := Scala213 // the default Scala
 
@@ -86,7 +86,7 @@ val MUnitCatsEffectVersion = "2.0.0"
 val MUnitDisciplineVersion = "2.0.0-M3"
 val MUnitScalaCheckEffectVersion = "2.0.0-M2"
 val OpenTelemetryVersion = "1.46.0"
-val OpenTelemetryInstrumentationVersion = "2.11.0"
+val OpenTelemetryInstrumentationVersion = "2.12.0"
 val OpenTelemetryInstrumentationAlphaVersion = "2.10.0-alpha"
 val OpenTelemetrySemConvVersion = "1.29.0-alpha"
 val OpenTelemetryProtoVersion = "1.5.0-alpha"

diff --git a/examples/src/main/scala/PekkoHttpExample.scala b/examples/src/main/scala/PekkoHttpExample.scala
@@ -66,7 +66,7 @@ import scala.concurrent.duration._
   *   run / fork := true,
   *   javaOptions += "-Dotel.java.global-autoconfigure.enabled=true",
   *   javaOptions += "-Dotel.service.name=pekko-otel4s",
-  *   javaAgents += "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % "2.11.0" % Runtime
+  *   javaAgents += "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % "2.12.0" % Runtime
   * )
   * }}}
   */

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.6")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.6")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.6")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.6")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")