Remove redundant setting of MultiJvm config

apache · Jan 21, 2024 · adaec2a · adaec2a
1 parent 3c7921c
commit adaec2a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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")
@@ -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")
@@ -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)
 
@@ -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")
@@ -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")
@@ -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)
 
@@ -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")
@@ -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")

diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
@@ -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
 

diff --git a/project/MultiNode.scala b/project/MultiNode.scala
@@ -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 && MultiNode
 
   override lazy val projectSettings: Seq[Def.Setting[_]] = multiJvmSettings
 

diff --git a/project/ScalafixForMultiNodePlugin.scala b/project/ScalafixForMultiNodePlugin.scala
@@ -18,7 +18,7 @@ import scalafix.sbt.ScalafixPlugin.autoImport.scalafixConfigSettings
 object ScalafixForMultiNodePlugin extends AutoPlugin with ScalafixSupport {
   override def trigger: PluginTrigger = allRequirements
 
-  override def requires: Plugins = MultiNode && ScalafixPlugin
+  override def requires: Plugins = MultiNode && ScalafixPlugin && MultiJvmPlugin
 
   import MultiJvmPlugin.autoImport._
 

diff --git a/project/ValidatePullRequest.scala b/project/ValidatePullRequest.scala
@@ -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