aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-08-31 21:52:06 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-08-31 21:52:06 -0300
commitc71d44cb57c5daddaa8e58cd1b559bb88bbd2a04 (patch)
treed6690bef6f442d63673223447b807223a9b8cafc /project
parent6fe0f1294a53d45e6c1b863f32fe22f3a641d25c (diff)
downloadKamon-c71d44cb57c5daddaa8e58cd1b559bb88bbd2a04.tar.gz
Kamon-c71d44cb57c5daddaa8e58cd1b559bb88bbd2a04.tar.bz2
Kamon-c71d44cb57c5daddaa8e58cd1b559bb88bbd2a04.zip
+ core: initial support for akka remoting/cluster, related to #61
Diffstat (limited to 'project')
-rw-r--r--project/AspectJ.scala2
-rw-r--r--project/Dependencies.scala2
-rw-r--r--project/Projects.scala2
3 files changed, 4 insertions, 2 deletions
diff --git a/project/AspectJ.scala b/project/AspectJ.scala
index 711ce98b..f33555e1 100644
--- a/project/AspectJ.scala
+++ b/project/AspectJ.scala
@@ -7,7 +7,7 @@ import com.typesafe.sbt.SbtAspectj.AspectjKeys.{ aspectjVersion, compileOnly, li
object AspectJ {
lazy val aspectJSettings = aspectjSettings ++ Seq(
- aspectjVersion := Dependencies.aspectjVersion,
+ aspectjVersion in Aspectj := Dependencies.aspectjVersion,
compileOnly in Aspectj := true,
fork in Test := true,
javaOptions in Test <++= weaverOptions in Aspectj,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c11258e8..b733fb12 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -29,6 +29,8 @@ object Dependencies {
val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion
+ val akkaRemote = "com.typesafe.akka" %% "akka-remote" % akkaVersion
+ val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion
val play = "com.typesafe.play" %% "play" % playVersion
val playWS = "com.typesafe.play" %% "play-ws" % playVersion
val playTest = "org.scalatestplus" %% "play" % "1.1.0"
diff --git a/project/Projects.scala b/project/Projects.scala
index 9313a3d3..a52cb834 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -24,7 +24,7 @@ object Projects extends Build {
mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value,
libraryDependencies ++=
compile(akkaActor, aspectJ, hdrHistogram) ++
- provided(logback, aspectjWeaver) ++
+ provided(akkaRemote, akkaCluster, logback, aspectjWeaver) ++
test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback, scalazConcurrent))