diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-29 10:17:29 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-29 10:17:29 +0100 |
| commit | 9248e13f0a2de65ae406240c208bbcfeddcf3b2e (patch) | |
| tree | 5989bcd31a1055fb8a9481c764ae7c6e3ad668bb /project | |
| parent | 0e49b69ac88107b26ef4e3c854eb2448eefcfd98 (diff) | |
| parent | 63728562a09360871a167a67fcf43290c423d21f (diff) | |
| download | Kamon-9248e13f0a2de65ae406240c208bbcfeddcf3b2e.tar.gz Kamon-9248e13f0a2de65ae406240c208bbcfeddcf3b2e.tar.bz2 Kamon-9248e13f0a2de65ae406240c208bbcfeddcf3b2e.zip | |
Merge branch 'master' of github.com:kamon-io/Kamon
Diffstat (limited to 'project')
| -rw-r--r-- | project/Projects.scala | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/project/Projects.scala b/project/Projects.scala index 6da9b95c..a8d4b526 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -45,8 +45,21 @@ object Projects extends Build { test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) - lazy val kamonAkkaRemote = Project("kamon-akka-remote", file("kamon-akka-remote")) + lazy val kamonAkka = Project("kamon-akka", file("kamon-akka")) .dependsOn(kamonCore) + .dependsOn(kamonMacros % "compile-internal, test-internal") + .settings(basicSettings: _* ) + .settings(formatSettings: _*) + .settings(aspectJSettings: _*) + .settings( + libraryDependencies ++= + compile(akkaActor) ++ + provided(aspectJ) ++ + optional(logback) ++ + test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + + lazy val kamonAkkaRemote = Project("kamon-akka-remote", file("kamon-akka-remote")) + .dependsOn(kamonAkka) .settings(basicSettings: _* ) .settings(formatSettings: _*) .settings(aspectJSettings: _*) |