From c1c4d97411536d437f076014fd3a952bdb78e1bb Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:04:39 +0100 Subject: [PATCH 1/2] latest stable pekko releases Update plugins.sbt Update plugins.sbt --- build.sbt | 14 +++++++------- instrumentation/kamon-pekko/build.sbt | 2 +- project/plugins.sbt | 5 ++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 4c94d08f0..82fed9bc7 100644 --- a/build.sbt +++ b/build.sbt @@ -543,6 +543,8 @@ lazy val `kamon-akka-http` = (project in file("instrumentation/kamon-akka-http") .dependsOn(`kamon-akka`, `kamon-testkit` % "test") +lazy val pekkoVersion = "1.0.3" +lazy val pekkoHttpVersion = "1.0.1" lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) .enablePlugins(JavaAgent) @@ -551,7 +553,7 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) .settings(Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version), libraryDependencies ++= Seq( - "org.apache.pekko" %% "pekko-actor" % "1.0.1" % "provided" + "org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided" ) )) .dependsOn( @@ -559,8 +561,6 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) `kamon-testkit` % "test" ) -lazy val pekkoHttpVersion = "1.0.0" - lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http")) .enablePlugins(JavaAgent) .disablePlugins(AssemblyPlugin) @@ -570,7 +570,7 @@ lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http libraryDependencies ++= Seq( kanelaAgent % "provided", "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided", - "org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided", + "org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided", scalatest % "test", slf4jApi % "test", slf4jnop % "test", @@ -592,11 +592,11 @@ lazy val `kamon-pekko-grpc` = (project in file("instrumentation/kamon-pekko-grpc kanelaAgent % "provided", "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided", - "org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided", - "org.apache.pekko" %% "pekko-discovery"% "1.0.0" % "provided", + "org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided", + "org.apache.pekko" %% "pekko-discovery"% pekkoVersion % "provided", "com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.8" % "provided", - "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.0" % "provided", + "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.2" % "provided", "io.grpc" % "grpc-stub" % "1.43.2" % "provided", diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index 5596992a1..c9ce3902c 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -4,7 +4,7 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version) )) -val pekkoVersion = "1.0.1" +val pekkoVersion = "1.0.3" libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq( kanelaAgent % "provided", scalatest % Test, diff --git a/project/plugins.sbt b/project/plugins.sbt index 4ae8d45fc..df7059a4b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,6 @@ +// needed due to dependency convergence issues +libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") @@ -15,4 +18,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3") -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0") +addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2") From 5e8985023c1400439b8f4def009ab306a2021c34 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 2 Sep 2024 13:57:08 +0100 Subject: [PATCH 2/2] remove pekko-protobuf depedency --- instrumentation/kamon-pekko/build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index c9ce3902c..a28a7bb87 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -15,7 +15,6 @@ libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else "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 )}