Skip to content

Commit 291e81d

Browse files
committed
latest stable pekko releases
Update plugins.sbt Update plugins.sbt
1 parent cdbc5a3 commit 291e81d

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

build.sbt

+7-7
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ lazy val `kamon-akka-http` = (project in file("instrumentation/kamon-akka-http")
542542
.dependsOn(`kamon-akka`, `kamon-testkit` % "test")
543543

544544

545+
lazy val pekkoVersion = "1.0.3"
546+
lazy val pekkoHttpVersion = "1.0.1"
545547

546548
lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko"))
547549
.enablePlugins(JavaAgent)
@@ -550,16 +552,14 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko"))
550552
.settings(Seq(
551553
crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version),
552554
libraryDependencies ++= Seq(
553-
"org.apache.pekko" %% "pekko-actor" % "1.0.1" % "provided"
555+
"org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided"
554556
)
555557
))
556558
.dependsOn(
557559
`kamon-scala-future` % "compile",
558560
`kamon-testkit` % "test"
559561
)
560562

561-
lazy val pekkoHttpVersion = "1.0.0"
562-
563563
lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http"))
564564
.enablePlugins(JavaAgent)
565565
.disablePlugins(AssemblyPlugin)
@@ -569,7 +569,7 @@ lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http
569569
libraryDependencies ++= Seq(
570570
kanelaAgent % "provided",
571571
"org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided",
572-
"org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided",
572+
"org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided",
573573
scalatest % "test",
574574
slf4jApi % "test",
575575
slf4jnop % "test",
@@ -591,11 +591,11 @@ lazy val `kamon-pekko-grpc` = (project in file("instrumentation/kamon-pekko-grpc
591591
kanelaAgent % "provided",
592592

593593
"org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided",
594-
"org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided",
595-
"org.apache.pekko" %% "pekko-discovery"% "1.0.0" % "provided",
594+
"org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided",
595+
"org.apache.pekko" %% "pekko-discovery"% pekkoVersion % "provided",
596596

597597
"com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.8" % "provided",
598-
"org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.0" % "provided",
598+
"org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.2" % "provided",
599599
"io.grpc" % "grpc-stub" % "1.43.2" % "provided",
600600

601601

instrumentation/kamon-pekko/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq(
44
crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version)
55
))
66

7-
val pekkoVersion = "1.0.1"
7+
val pekkoVersion = "1.0.3"
88
libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq(
99
kanelaAgent % "provided",
1010
scalatest % Test,

project/plugins.sbt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// needed due to dependency convergence issues
2+
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
3+
14
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
25
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
36
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
@@ -15,4 +18,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0")
1518
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
1619

1720
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3")
18-
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0")
21+
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2")

0 commit comments

Comments
 (0)