Skip to content

Commit

Permalink
fix: Regression on jar size, slf4j (#1299)
Browse files Browse the repository at this point in the history
* pekko dependencies should only be provided

* bump sbt, slf4j
  • Loading branch information
hughsimpson committed Oct 9, 2023
1 parent 8a1502e commit 12983f9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -60,7 +60,7 @@ lazy val `kamon-core` = (project in file("core/kamon-core"))
),
libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.4.1",
"org.slf4j" % "slf4j-api" % "1.7.25",
"org.slf4j" % "slf4j-api" % "1.7.36",
"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
16 changes: 8 additions & 8 deletions instrumentation/kamon-pekko/build.sbt
Expand Up @@ -6,16 +6,16 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq(

val pekkoVersion = "1.0.1"
libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq(
kanelaAgent,
kanelaAgent % "provided",
scalatest % Test,
logbackClassic % Test,
"org.apache.pekko" %% "pekko-actor" % pekkoVersion,
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion,
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
"org.apache.pekko" %% "pekko-remote" % pekkoVersion,
"org.apache.pekko" %% "pekko-cluster" % pekkoVersion,
"org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion,
"org.apache.pekko" %% "pekko-protobuf" % pekkoVersion,
"org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-remote" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-cluster" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-protobuf" % pekkoVersion % "provided,test",
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test
)}

Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
Expand Up @@ -27,9 +27,9 @@ object BaseProject extends AutoPlugin {
lazy val Shaded = config("shaded").hide

val kanelaAgent = "io.kamon" % "kanela-agent" % "1.0.17"
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.25"
val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.24"
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.3"
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.36"
val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.36"
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.12"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.9"
val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.1.10"
val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.10.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.9.2
sbt.version=1.9.6

0 comments on commit 12983f9

Please sign in to comment.