Skip to content

Commit

Permalink
bump packaged oshi, newrelic, zipkin, nanojson, guava and slf4j-api d…
Browse files Browse the repository at this point in the history
…ependencies; also bump scala 2.12 and scala 2.13 dependencies (was hitting a compilation error with 2.12.12 and it seemed prudent...)
  • Loading branch information
hughsimpson committed Mar 4, 2024
1 parent 5327237 commit a9f9c64
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ lazy val `kamon-core` = (project in file("core/kamon-core"))
).inAll
),
libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.4.1",
"org.slf4j" % "slf4j-api" % "1.7.36",
"com.typesafe" % "config" % "1.4.3",
"org.slf4j" % "slf4j-api" % "2.0.12",
"org.hdrhistogram" % "HdrHistogram" % "2.1.9" % "provided,shaded",
"org.jctools" % "jctools-core" % "3.3.0" % "provided,shaded",
"com.oracle.substratevm" % "svm" % "19.2.1" % "provided"
Expand Down Expand Up @@ -188,7 +188,7 @@ lazy val `kamon-executors-bench` = (project in file("instrumentation/kamon-execu
.settings(noPublishing: _*)
.settings(
libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "24.1-jre",
"com.google.guava" % "guava" % "33.0.0-jre",
kanelaAgent % "provided",
)
).dependsOn(`kamon-core`, `kamon-instrumentation-common`)
Expand Down Expand Up @@ -856,7 +856,7 @@ lazy val `kamon-datadog` = (project in file("reporters/kamon-datadog"))
),
libraryDependencies ++= Seq(
okHttp % "shaded,provided",
"com.grack" % "nanojson" % "1.6",
"com.grack" % "nanojson" % "1.8",

("com.typesafe.play" %% "play-json" % "2.7.4" % "test").cross(CrossVersion.for3Use2_13),
scalatest % "test",
Expand Down Expand Up @@ -910,8 +910,8 @@ lazy val `kamon-zipkin` = (project in file("reporters/kamon-zipkin"))
.disablePlugins(AssemblyPlugin)
.settings(
libraryDependencies ++= Seq(
"io.zipkin.reporter2" % "zipkin-reporter" % "2.7.15",
"io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "2.7.15",
"io.zipkin.reporter2" % "zipkin-reporter" % "3.3.0",
"io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "3.3.0",
scalatest % "test"
)
).dependsOn(`kamon-core`)
Expand Down Expand Up @@ -952,8 +952,8 @@ lazy val `kamon-newrelic` = (project in file("reporters/kamon-newrelic"))
.disablePlugins(AssemblyPlugin)
.settings(
libraryDependencies ++= Seq(
"com.newrelic.telemetry" % "telemetry-core" % "0.15.0",
"com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.15.0",
"com.newrelic.telemetry" % "telemetry-core" % "0.16.0",
"com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.16.0",
scalatest % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object BaseProject extends AutoPlugin {
val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.12.0"
val okHttpMockServer = "com.squareup.okhttp3" % "mockwebserver" % "4.10.0"
val jsqlparser = "com.github.jsqlparser" % "jsqlparser" % "4.1"
val oshiCore = "com.github.oshi" % "oshi-core" % "5.7.5"
val oshiCore = "com.github.oshi" % "oshi-core" % "6.4.13"


val kanelaAgentVersion = settingKey[String]("Kanela Agent version")
Expand All @@ -57,8 +57,8 @@ object BaseProject extends AutoPlugin {
)

val `scala_2.11_version` = "2.11.12"
val `scala_2.12_version` = "2.12.15"
val `scala_2.13_version` = "2.13.8"
val `scala_2.12_version` = "2.12.19"
val `scala_2.13_version` = "2.13.13"
val scala_3_version = "3.3.1"

// This installs the GPG signing key from the
Expand Down

0 comments on commit a9f9c64

Please sign in to comment.