This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new c4a3c5246 Update multi-jvm
c4a3c5246 is described below
commit c4a3c524683ec7cf9a460e03658557fe3e69bc18
Author: Matthew de Detrich <[email protected]>
AuthorDate: Sun Jan 21 11:21:36 2024 +1100
Update multi-jvm
---
build.sbt | 1 -
project/MultiNode.scala | 4 ++--
project/plugins.sbt | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/build.sbt b/build.sbt
index a7cef3019..af679c38b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -243,7 +243,6 @@ lazy val httpTests = project("http-tests")
.enablePlugins(NoPublish) // don't release tests
.enablePlugins(MultiNode)
.disablePlugins(MimaPlugin) // this is only tests
- .configs(MultiJvm)
.settings(headerSettings(MultiJvm))
.addPekkoModuleDependency("pekko-stream", "provided",
PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-multi-node-testkit", "test",
PekkoCoreDependency.default)
diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index f1350e0db..edcf26146 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
*/
-import com.typesafe.sbt.SbtMultiJvm
+import com.typesafe.sbt.{ MultiJvmPlugin, SbtMultiJvm }
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys._
import sbt._
import sbt.Keys._
@@ -33,7 +33,7 @@ object MultiNode extends AutoPlugin {
val multiTest = CliOptions.multiNode.ifTrue(MultiJvm /
multiNodeTest).getOrElse(MultiJvm / test)
override def trigger = noTrigger
- override def requires = plugins.JvmPlugin
+ override def requires = plugins.JvmPlugin && MultiJvmPlugin
override lazy val projectSettings = multiJvmSettings
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8a6ee8497..e10fb7098 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -10,7 +10,7 @@
resolvers += Classpaths.sbtPluginReleases
resolvers += Classpaths.typesafeReleases
-addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
+addSbtPlugin("com.github.sbt" % "sbt-multi-jvm" % "0.5.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
