From a2b1e85ce85e7f2ffee9b0b9223d4e4a29e73651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Lemaitre?= Date: Mon, 22 Jul 2024 14:57:05 +0200 Subject: [PATCH] chore: Upgrade otel4s to 0.8.0 and skunk to 1.0.0-M7 (#123) --- build.sbt | 4 ++-- project/Dependencies.scala | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 6537e1a05..29d564bd9 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ inThisBuild( licenses += ( "Apache-2.0", url( - "http://www.apache.org/licenses/LICENSE-2.0" + "https://www.apache.org/licenses/LICENSE-2.0" ) ), scalacOptions ++= ScalacOptions.tokensForVersion( @@ -76,7 +76,7 @@ lazy val dbSkunk = Project("pillars-db-skunk", file("modules/db-skunk")) .settings( name := "pillars-db-skunk", description := "pillars-db-skunk is a scala 3 library providing database services for writing backend applications using skunk", - libraryDependencies ++= Dependencies.database, + libraryDependencies ++= Dependencies.skunk, buildInfoKeys := Seq[BuildInfoKey](name, version, description), buildInfoPackage := "pillars.db.build" ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3308050a8..507cc7503 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -82,14 +82,14 @@ object Dependencies { ) val observability: Seq[ModuleID] = Seq( - "org.typelevel" %% "otel4s-oteljava" % "0.6.0", + "org.typelevel" %% "otel4s-oteljava" % "0.8.0", "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.40.0" % Runtime, "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.40.0" % Runtime ) - val database: Seq[ModuleID] = Seq( - "org.tpolecat" %% "skunk-core" % "1.0.0-M6", - "org.tpolecat" %% "skunk-circe" % "1.0.0-M6" + val skunk: Seq[ModuleID] = Seq( + "org.tpolecat" %% "skunk-core" % "1.0.0-M7", + "org.tpolecat" %% "skunk-circe" % "1.0.0-M7" ) ++ tests val doobie: Seq[ModuleID] = Seq( @@ -116,6 +116,7 @@ object Dependencies { val flags: Seq[ModuleID] = Seq( "org.typelevel" %% "literally" % "1.2.0" ) ++ tests + val httpClient: Seq[ModuleID] = http4sClient ++ http4s ++ tests val core: Seq[ModuleID] = effect ++ json ++ tapir ++ http4s ++ http4sServer ++ model ++ commandLine ++ logging ++ observability ++ tests