diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 13:48:24 -0300 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 13:48:24 -0300 |
commit | b0df3654cb82d87971fa67ff56a2e183dc93358f (patch) | |
tree | c2ab91b00751c4967ce3aa066c1428a70eb514cf /project/Projects.scala | |
parent | 8bf93c1f26453ef298d965aaa8b9cb932f8b2a64 (diff) | |
parent | 69dbbb558737f482a1003fe35b19da7e8bd35309 (diff) | |
download | Kamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.tar.gz Kamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.tar.bz2 Kamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.zip |
Merge remote-tracking branch 'crypticmind/master'
Diffstat (limited to 'project/Projects.scala')
-rw-r--r-- | project/Projects.scala | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/project/Projects.scala b/project/Projects.scala index 5d747e49..1043ae58 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -14,10 +14,13 @@ object Projects extends Build { lazy val kamonCore = Project("kamon-core", file("kamon-core")) + .dependsOn(kamonMacros) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) .settings( + mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, + mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= compile(akkaActor, aspectJ, aspectjWeaver, hdrHistogram, jsr166) ++ provided(logback) ++ @@ -81,13 +84,18 @@ object Projects extends Build { .settings(formatSettings: _*) .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) - + lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog")) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) + lazy val kamonMacros = Project("kamon-macros", file("kamon-macros")) + .settings(basicSettings: _*) + .settings(formatSettings: _*) + .settings(noPublishing: _*) + .settings(libraryDependencies ++= compile(scalaCompiler)) val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) } |