Skip to content

Commit

Permalink
Merge branch 'master' into update/macros-2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
biandratti authored Oct 6, 2024
2 parents a54c85c + 493995d commit 38dacfc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ lazy val commonSettings = Seq(
organization := "biandratti",
scalaVersion := "2.13.14",
scalacOptions += "-Xsource:3",
ThisBuild / scapegoatVersion := "3.0.0",
ThisBuild / scapegoatVersion := "3.0.3",
// wartremoverErrors ++= Warts.unsafe.diff(Seq(Wart.Any)),
// wartremoverExcluded ++= (Compile / routes).value,
coverageFailOnMinimum := true,
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ object Dependencies {
}

lazy val kamonDependencies: Seq[ModuleID] = {
val kamonVersion = "2.7.3"
val kamonVersion = "2.7.4"
Seq(
"io.kamon" %% "kamon-bundle" % kamonVersion,
"io.kamon" %% "kamon-prometheus" % kamonVersion,
"io.kamon" %% "kamon-jaeger" % kamonVersion
)
}

lazy val JavaInstrumentVersion = "2.7.0"
lazy val JavaInstrumentVersion = "2.8.0"

lazy val openTelemetryDependencies = {
val version = "1.42.0"
val version = "1.42.1"
Seq(
"io.opentelemetry" % "opentelemetry-api" % version,
"io.opentelemetry.instrumentation" % "opentelemetry-logback-appender-1.0" % s"$JavaInstrumentVersion-alpha" % "runtime"
)
}

lazy val gatling = {
val version = "3.11.5"
val version = "3.12.0"
Seq(
"io.gatling" % "gatling-core" % version,
"io.gatling" % "gatling-test-framework" % version,
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

//lints
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.2.1")
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")

//coverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
Expand All @@ -19,7 +19,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "5.1.0")

//gatling
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.9.2")
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.10.0")

//https://github.com/scala/bug/issues/12632
ThisBuild / libraryDependencySchemes ++= Seq(
Expand Down

0 comments on commit 38dacfc

Please sign in to comment.