diff --git a/akka-docs/dev/multi-jvm-testing.rst b/akka-docs/dev/multi-jvm-testing.rst index ce150f8bef..7658324a74 100644 --- a/akka-docs/dev/multi-jvm-testing.rst +++ b/akka-docs/dev/multi-jvm-testing.rst @@ -18,7 +18,7 @@ http://github.com/typesafehub/sbt-multi-jvm You can add it as a plugin by adding the following to your project/plugins.sbt:: - addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.2.0") + addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.0") You can then add multi-JVM testing to ``project/Build.scala`` by including the ``MultiJvm`` settings and config. For example, here is an example of how the akka-remote-tests project adds @@ -47,7 +47,7 @@ multi-JVM testing (Simplified for clarity): ) ) configs (MultiJvm) - lazy val buildSettings = Defaults.defaultSettings ++ SbtMultiJvm.settings ++ Seq( + lazy val buildSettings = Defaults.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( organization := "com.typesafe.akka", version := "2.1-SNAPSHOT", scalaVersion := "|scalaVersion|", diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 8b9e7e35d9..cf1cdcb64c 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -471,7 +471,7 @@ object AkkaBuild extends Build { .setPreference(AlignSingleLineCaseStatements, true) } - lazy val multiJvmSettings = SbtMultiJvm.settings ++ inConfig(MultiJvm)(ScalariformPlugin.scalariformSettings) ++ Seq( + lazy val multiJvmSettings = SbtMultiJvm.multiJvmSettings ++ inConfig(MultiJvm)(ScalariformPlugin.scalariformSettings) ++ Seq( compileInputs in MultiJvm <<= (compileInputs in MultiJvm) dependsOn (ScalariformKeys.format in MultiJvm), compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test), ScalariformKeys.preferences in MultiJvm := formattingPreferences) ++ diff --git a/project/plugins.sbt b/project/plugins.sbt index 35c8124986..eabbcded14 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ resolvers += Classpaths.typesafeResolver -addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.2.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.0") addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.4.0")