Revert "!sbt Use multiJvmPlugin from pekko." (apache#298)

This reverts commit 1f5b25d.
mdedetrich · Aug 9, 2023 · 8b6ec62 · 8b6ec62
1 parent e5ed72d
commit 8b6ec62
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 753 deletions.
diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ import ValidatePullRequest._
 import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin.reproducibleBuildsCheckResolver
 import PekkoDependency._
 import Dependencies.{ h2specExe, h2specName }
-import MultiJvmPlugin.MultiJvmKeys.MultiJvm
+import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 import java.nio.file.Files
 import java.nio.file.attribute.{ PosixFileAttributeView, PosixFilePermission }
 

diff --git a/project/Jvm.scala b/project/Jvm.scala
diff --git a/project/MultiNode.scala b/project/MultiNode.scala
@@ -11,8 +11,8 @@
  * Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
  */
 
-import MultiJvmPlugin.MultiJvmKeys.multiJvmCreateLogger
-import MultiJvmPlugin.MultiJvmKeys._
+import com.typesafe.sbt.SbtMultiJvm
+import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys._
 import sbt._
 import sbt.Keys._
 
@@ -57,7 +57,7 @@ object MultiNode extends AutoPlugin {
   }
 
   private val multiJvmSettings =
-    MultiJvmPlugin.multiJvmSettings ++
+    SbtMultiJvm.multiJvmSettings ++
     inConfig(MultiJvm)(org.scalafmt.sbt.ScalafmtPlugin.scalafmtConfigSettings) ++
     inConfig(MultiJvm)(Seq(
       MultiJvm / jvmOptions := defaultMultiJvmOptions,