latest stable pekko releases

Update plugins.sbt Update plugins.sbt
kamon-io · Jul 26, 2024 · 0d0872b · 0d0872b
1 parent 3001eb7
commit 0d0872b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -542,6 +542,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)
@@ -550,16 +552,14 @@ 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(
     `kamon-scala-future` % "compile",
     `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)
@@ -569,7 +569,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",
@@ -591,11 +591,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
@@ -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
@@ -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")