raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Factor out localhost and re-enable schoir.

Browse source
This commit is contained in:
Eugene Vigdorchik 2012-01-25 20:12:26 +04:00
parent 7f3a9cd756
commit c8cd25e913
8 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project/AkkaBuild.scala
View file

@ -8,7 +8,7 @@ import sbt._
import sbt.Keys._
import com.typesafe.sbtmultijvm.MultiJvmPlugin
import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
//import com.typesafe.schoir.SchoirPlugin.schoirSettings
import com.typesafe.schoir.SchoirPlugin.schoirSettings
import com.typesafe.sbtscalariform.ScalariformPlugin
import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
import java.lang.Boolean.getBoolean
@ -71,7 +71,7 @@ object AkkaBuild extends Build {
id = "akka-remote",
base = file("akka-remote"),
dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"),
settings = defaultSettings ++ multiJvmSettings ++ /*schoirSettings ++*/ Seq(
settings = defaultSettings ++ multiJvmSettings ++ schoirSettings ++ Seq(
libraryDependencies ++= Dependencies.remote,
// disable parallel tests
parallelExecution in Test := false,

2
project/plugins.sbt
View file

@ -3,7 +3,7 @@ resolvers += Classpaths.typesafeResolver
addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.9")
//addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.1")
addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.2")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.5.0")