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

merge master into parental-supervision, fixing up resulting breakage

Browse source
This commit is contained in:
Roland 2011-10-21 15:11:43 +02:00
commit d55f02e6c1
95 changed files with 759 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

10
project/AkkaBuild.scala
View file

@ -25,7 +25,7 @@ object AkkaBuild extends Build {
Unidoc.unidocExclude := Seq(samples.id, tutorials.id),
rstdocDirectory <<= baseDirectory / "akka-docs"
),
aggregate = Seq(actor, testkit, actorTests, stm, http, remote, slf4j, samples, tutorials, docs)
aggregate = Seq(actor, testkit, actorTests, stm, http, remote, slf4j, akkaSbtPlugin, samples, tutorials, docs)
//aggregate = Seq(actor, testkit, actorTests, stm, http, slf4j, cluster, mailboxes, camel, camelTyped, samples, tutorials)
)
@ -228,6 +228,14 @@ object AkkaBuild extends Build {
// )
// )
lazy val akkaSbtPlugin = Project(
id = "akka-sbt-plugin",
base = file("akka-sbt-plugin"),
settings = defaultSettings ++ Seq(
sbtPlugin := true
)
)
lazy val samples = Project(
id = "akka-samples",
base = file("akka-samples"),