Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.12.18
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Jun 30, 2023
2 parents c413917 + 5d92eb4 commit 6cbfe8b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
scala: [2.13.11]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.3"
version = "3.7.5"

style = default

Expand Down
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import com.typesafe.tools.mima.core._
ThisBuild / tlBaseVersion := "0.3"

val scala212Version = "2.12.18"
val scala213Version = "2.13.10"
val scala213Version = "2.13.11"
val scala30Version = "3.2.2"

val collectionCompatVersion = "2.10.0"
val collectionCompatVersion = "2.11.0"

val catsVersion = "2.9.0"
val catsEffectVersion = "3.4.11"
Expand Down Expand Up @@ -179,7 +179,7 @@ lazy val lightstepGrpc = project
description := "Lightstep gRPC bindings for Natchez.",
libraryDependencies ++= Seq(
"com.lightstep.tracer" % "tracer-grpc" % "0.32.0",
"io.grpc" % "grpc-netty" % "1.55.1",
"io.grpc" % "grpc-netty" % "1.56.0",
"io.netty" % "netty-tcnative-boringssl-static" % "2.0.61.Final"
),
mimaPreviousArtifacts := Set()
Expand Down Expand Up @@ -223,7 +223,7 @@ lazy val opentelemetry = project
description := "Base OpenTelemetry Utilities for Natchez",
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.1.7").toMap,
libraryDependencies ++= Seq(
"io.opentelemetry" % "opentelemetry-sdk" % "1.26.0"
"io.opentelemetry" % "opentelemetry-sdk" % "1.27.0"
)
)

Expand All @@ -236,8 +236,8 @@ lazy val datadog = project
name := "natchez-datadog",
description := "Datadog bindings for Natchez.",
libraryDependencies ++= Seq(
"com.datadoghq" % "dd-trace-ot" % "1.14.0",
"com.datadoghq" % "dd-trace-api" % "1.14.0"
"com.datadoghq" % "dd-trace-ot" % "1.17.0",
"com.datadoghq" % "dd-trace-api" % "1.17.0"
)
)

Expand Down Expand Up @@ -363,10 +363,10 @@ lazy val examples = project
libraryDependencies ++= Seq(
"org.typelevel" %% "log4cats-slf4j" % "2.6.0",
"org.slf4j" % "slf4j-simple" % "2.0.7",
"eu.timepit" %% "refined" % "0.10.3",
"eu.timepit" %% "refined" % "0.11.0",
"is.cir" %% "ciris" % "3.1.0",
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.26.0",
"io.grpc" % "grpc-okhttp" % "1.55.1" // required for the OpenTelemetry exporter
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.27.0",
"io.grpc" % "grpc-okhttp" % "1.56.0" // required for the OpenTelemetry exporter
)
)

Expand Down Expand Up @@ -435,7 +435,7 @@ lazy val docs = project
"org.http4s" %% "http4s-client" % "0.23.15",
"org.typelevel" %% "log4cats-slf4j" % "2.4.0",
"org.slf4j" % "slf4j-simple" % "2.0.7",
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.26.0" // for the opentelemetry example
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.27.0" // for the opentelemetry example
),
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_3" // pray this does more good than harm
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.3
sbt.version=1.9.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")

0 comments on commit 6cbfe8b

Please sign in to comment.