diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-28 18:52:17 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-28 18:52:17 +0100 |
| commit | 63728562a09360871a167a67fcf43290c423d21f (patch) | |
| tree | 5989bcd31a1055fb8a9481c764ae7c6e3ad668bb /project | |
| parent | f10b854a56372e77d374911655879b3aec48f8e6 (diff) | |
| parent | 4d0e37594cb223b091ba2ec126eabe89ac8c13f8 (diff) | |
| download | Kamon-63728562a09360871a167a67fcf43290c423d21f.tar.gz Kamon-63728562a09360871a167a67fcf43290c423d21f.tar.bz2 Kamon-63728562a09360871a167a67fcf43290c423d21f.zip | |
Merge pull request #145 from kamon-io/wip/sub-projects-separation
Separate all akka-related stuff into it's own module.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 4 | ||||
| -rw-r--r-- | project/Projects.scala | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 761db941..6b085067 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,8 +29,8 @@ object Dependencies { val playVersion = "2.3.5" val sigarVersion = "1.6.5.132" - val sprayJson = "io.spray" %% "spray-json" % "1.3.0" - val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.4" + val sprayJson = "io.spray" %% "spray-json" % "1.3.1" + val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.6.0" val scalatest = "org.scalatest" %% "scalatest" % "2.2.1" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjweaver" % aspectjVersion diff --git a/project/Projects.scala b/project/Projects.scala index 83bf13a0..a8d4b526 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -21,7 +21,7 @@ object Projects extends Build { import Settings._ import Dependencies._ - lazy val root = Project("root", file(".")) + lazy val kamon = Project("kamon", file(".")) .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsD, kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc) .settings(basicSettings: _*) @@ -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: _*) |