= all: stop using config.getDuration in favor of config.getFiniteDuration.

1 files changed, 28 insertions, 48 deletions

diff --git a/project/Projects.scala b/project/Projects.scala
index e2aed340..d52a7764 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -30,14 +30,11 @@ object Projects extends Build {
 
 
   lazy val kamonCore: Project = Project("kamon-core", file("kamon-core"))
-    .dependsOn(kamonMacros % "compile-internal, test-internal")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
     .settings(
-      javacOptions  in Compile ++= Seq("-XDignore.symbol.file"),
-      mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value,
-      mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value,
+      javacOptions in Compile ++= Seq("-XDignore.symbol.file"),
       libraryDependencies ++=
         compile(akkaActor, hdrHistogram) ++
         provided(aspectJ) ++
@@ -47,7 +44,6 @@ object Projects extends Build {
 
   lazy val kamonAkka = Project("kamon-akka", file("kamon-akka"))
     .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonMacros % "compile-internal, test-internal")
     .dependsOn(kamonScala)
     .settings(basicSettings: _* )
     .settings(formatSettings: _*)
@@ -62,7 +58,6 @@ object Projects extends Build {
 
   lazy val kamonScala = Project("kamon-scala", file("kamon-scala"))
     .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonMacros % "compile-internal, test-internal")
     .settings(basicSettings: _* )
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
@@ -86,23 +81,18 @@ object Projects extends Build {
 
 
   lazy val kamonSpray = Project("kamon-spray", file("kamon-spray"))
-    .dependsOn(kamonMacros % "compile-internal, test-internal")
+    .dependsOn(kamonCore % "compile->compile;test->test", kamonAkka, kamonTestkit % "test")
     .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, sprayCan, sprayClient, sprayRouting) ++
         provided(aspectJ) ++
         test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, slf4Jul, slf4Log4j, logback))
-    .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonAkka)
-    .dependsOn(kamonTestkit % "test")
-
 
   lazy val kamonNewrelic = Project("kamon-newrelic", file("kamon-newrelic"))
+    .dependsOn(kamonCore % "compile->compile;test->test", kamonTestkit % "compile->compile;test->test")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
@@ -111,11 +101,10 @@ object Projects extends Build {
         compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, akkaSlf4j) ++
         provided(aspectJ) ++
         test(scalatest, akkaTestKit, sprayTestkit, slf4Api, akkaSlf4j))
-    .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonTestkit % "compile->compile;test->test")
 
 
   lazy val kamonPlayground = Project("kamon-playground", file("kamon-playground"))
+    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsD, kamonDatadog, kamonLogReporter, kamonSystemMetrics)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
@@ -123,19 +112,19 @@ object Projects extends Build {
     .settings(
       libraryDependencies ++=
         compile(akkaActor, akkaSlf4j, sprayCan, sprayClient, sprayRouting, logback))
-    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsD, kamonDatadog, kamonLogReporter, kamonSystemMetrics)
 
 
   lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard"))
+    .dependsOn(kamonCore)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(
       libraryDependencies ++=
         compile(akkaActor, akkaSlf4j, sprayRouting, sprayCan, sprayJson))
-    .dependsOn(kamonCore)
 
 
   lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit"))
+    .dependsOn(kamonCore)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(
@@ -143,9 +132,9 @@ object Projects extends Build {
         compile(akkaActor, akkaTestKit) ++
         provided(aspectJ) ++
         test(slf4Api, slf4nop))
-    .dependsOn(kamonCore)
 
   lazy val kamonPlay = Project("kamon-play", file("kamon-play"))
+    .dependsOn(kamonCore % "compile->compile;test->test", kamonScala, kamonAkka)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
@@ -154,64 +143,55 @@ object Projects extends Build {
         compile(play, playWS) ++
         provided(aspectJ) ++
         test(playTest, akkaTestKit, slf4Api))
-    .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonScala)
-    .dependsOn(kamonAkka)
 
   lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd"))
+    .dependsOn(kamonCore % "compile->compile;test->test")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(
       libraryDependencies ++=
         compile(akkaActor) ++
         test(scalatest, akkaTestKit, slf4Api, slf4nop))
-    .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonSystemMetrics % "provided")
- 
+
   lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog"))
+    .dependsOn(kamonCore % "compile->compile;test->test")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(
       libraryDependencies ++=
         compile(akkaActor) ++
         test(scalatest, akkaTestKit, slf4Api, slf4nop))
-    .dependsOn(kamonCore % "compile->compile;test->test")
-    .dependsOn(kamonSystemMetrics % "provided")
+
 
   lazy val kamonLogReporter = Project("kamon-log-reporter", file("kamon-log-reporter"))
+    .dependsOn(kamonCore)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(
       libraryDependencies ++=
         compile(akkaActor) ++
         test(scalatest, akkaTestKit, slf4Api, slf4nop))
-    .dependsOn(kamonCore)
 
-  lazy val kamonMacros = Project("kamon-macros", file("kamon-macros"))
+
+  lazy val kamonSystemMetrics = Project("kamon-system-metrics", file("kamon-system-metrics"))
+    .dependsOn(kamonCore % "compile->compile;test->test")
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
-    .settings(noPublishing: _*)
-    .settings(libraryDependencies ++= compile(scalaCompiler))
+    .settings(fork in Test :=  true)
+    .settings(
+      libraryDependencies ++=
+        compile(sigarLoader) ++
+        test(scalatest, akkaTestKit, slf4Api, slf4Jul, slf4Log4j, logback))
 
-  lazy val kamonSystemMetrics = Project("kamon-system-metrics", file("kamon-system-metrics"))
-      .settings(basicSettings: _*)
-      .settings(formatSettings: _*)
-      .settings(fork in Test :=  true)
-      .settings(
-        libraryDependencies ++=
-          compile(sigarLoader) ++
-          test(scalatest, akkaTestKit, slf4Api, slf4Jul, slf4Log4j, logback))
-      .dependsOn(kamonCore % "compile->compile;test->test")
-  
   lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc"))
-      .settings(basicSettings: _*)
-      .settings(formatSettings: _*)
-      .settings(aspectJSettings: _*)
-      .settings(
-        libraryDependencies ++=
-          test(h2,scalatest, akkaTestKit, slf4Api) ++
-          provided(aspectJ))
-      .dependsOn(kamonCore % "compile->compile;test->test")
+    .dependsOn(kamonCore % "compile->compile;test->test")
+    .settings(basicSettings: _*)
+    .settings(formatSettings: _*)
+    .settings(aspectJSettings: _*)
+    .settings(
+      libraryDependencies ++=
+        test(h2,scalatest, akkaTestKit, slf4Api) ++
+        provided(aspectJ))
 
   val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
 }