Skip to content

Commit

Permalink
Remove redundant setting of MultiJvm config
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Jan 21, 2024
1 parent 3c7921c commit 26b3721
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
8 changes: 0 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ lazy val cluster = pekkoModule("cluster")
.settings(OSGi.cluster)
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)

lazy val clusterMetrics = pekkoModule("cluster-metrics")
Expand All @@ -185,7 +184,6 @@ lazy val clusterMetrics = pekkoModule("cluster-metrics")
.settings(Protobuf.settings)
.settings(SigarLoader.sigarSettings)
.settings(Test / parallelExecution := false)
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)

lazy val clusterSharding = pekkoModule("cluster-sharding")
Expand All @@ -203,7 +201,6 @@ lazy val clusterSharding = pekkoModule("cluster-sharding")
.settings(AutomaticModuleName.settings("pekko.cluster.sharding"))
.settings(OSGi.clusterSharding)
.settings(Protobuf.settings)
.configs(MultiJvm)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
.enablePlugins(Jdk9)

Expand All @@ -216,7 +213,6 @@ lazy val clusterTools = pekkoModule("cluster-tools")
.settings(AutomaticModuleName.settings("pekko.cluster.tools"))
.settings(OSGi.clusterTools)
.settings(Protobuf.settings)
.configs(MultiJvm)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)

lazy val distributedData = pekkoModule("distributed-data")
Expand All @@ -226,7 +222,6 @@ lazy val distributedData = pekkoModule("distributed-data")
.settings(AddMetaInfLicenseFiles.distributedDataSettings)
.settings(OSGi.distributedData)
.settings(Protobuf.settings)
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)

lazy val docs = pekkoModule("docs")
Expand Down Expand Up @@ -427,7 +422,6 @@ lazy val remoteTests = pekkoModule("remote-tests")
.settings(Dependencies.remoteTests)
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest, NoPublish)
.disablePlugins(MimaPlugin)

Expand Down Expand Up @@ -535,7 +529,6 @@ lazy val clusterTyped = pekkoModule("cluster-typed")
.settings(Protobuf.settings)
// To be able to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "remote" / "src" / "main" / "protobuf"))
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)

lazy val clusterShardingTyped = pekkoModule("cluster-sharding-typed")
Expand All @@ -556,7 +549,6 @@ lazy val clusterShardingTyped = pekkoModule("cluster-sharding-typed")
// To be able to import ContainerFormats.proto
.settings(Protobuf.settings)
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "remote" / "src" / "main" / "protobuf"))
.configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest)

lazy val streamTyped = pekkoModule("stream-typed")
Expand Down
2 changes: 1 addition & 1 deletion project/CopyrightHeader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import MultiJvmPlugin.MultiJvmKeys._

trait CopyrightHeader extends AutoPlugin {

override def requires: Plugins = HeaderPlugin
override def requires: Plugins = HeaderPlugin && MultiJvmPlugin

override def trigger: PluginTrigger = allRequirements

Expand Down
2 changes: 1 addition & 1 deletion project/MultiNode.scala
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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: Seq[Def.Setting[_]] = multiJvmSettings

Expand Down
1 change: 0 additions & 1 deletion project/ValidatePullRequest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ object PekkoValidatePullRequest extends AutoPlugin {
*/
object MultiNodeWithPrValidation extends AutoPlugin {
import PekkoValidatePullRequest._
import MultiJvmPlugin.MultiJvmKeys.MultiJvm

override def trigger = allRequirements
override def requires = PekkoValidatePullRequest && MultiNode
Expand Down

0 comments on commit 26b3721

Please sign in to comment.