Merge branch 'master' into release-0.3_scala-2.11

Conflicts:
	.travis.yml
	project/Settings.scala

3 files changed, 41 insertions, 9 deletions

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3c2c6d0f..ce78497d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -35,7 +35,8 @@ object Dependencies {
   val slf4Api         = "org.slf4j"                 %   "slf4j-api"             % slf4jVersion
   val slf4nop         = "org.slf4j"                 %   "slf4j-nop"             % slf4jVersion
   val jsr166          = "io.gatling"                %   "jsr166e"               % "1.0"
-
+  val scalaCompiler   = "org.scala-lang"            %   "scala-compiler"        % Settings.ScalaVersion
+  val sigar           = "org.fusesource"            %   "sigar"                 % "1.6.4"
 
   def compile   (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile")
   def provided  (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided")
diff --git a/project/Projects.scala b/project/Projects.scala
index e8675186..8259f2aa 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -7,17 +7,21 @@ object Projects extends Build {
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsd)
+    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsD,
+      kamonDatadog, kamonSystemMetrics, kamonLogReporter)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
 
 
   lazy val kamonCore = Project("kamon-core", file("kamon-core"))
+    .dependsOn(kamonMacros % "compile-internal, test-internal")
     .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) ++
@@ -32,7 +36,8 @@ object Projects extends Build {
       libraryDependencies ++=
         compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++
         test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop))
-    .dependsOn(kamonCore, kamonTestkit)
+    .dependsOn(kamonCore)
+    .dependsOn(kamonTestkit % "test")
 
 
   lazy val kamonNewrelic = Project("kamon-newrelic", file("kamon-newrelic"))
@@ -53,7 +58,7 @@ object Projects extends Build {
     .settings(
       libraryDependencies ++=
         compile(akkaActor, akkaSlf4j, sprayCan, sprayClient, sprayRouting, logback))
-    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsd, kamonDatadog)
+    .dependsOn(kamonSpray, kamonNewrelic, kamonStatsD, kamonDatadog, kamonLogReporter, kamonSystemMetrics)
 
 
   lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard"))
@@ -76,18 +81,39 @@ object Projects extends Build {
     .settings(libraryDependencies ++= compile(play, playWS, aspectJ) ++ test(playTest, akkaTestKit, slf4Api))
     .dependsOn(kamonCore)
 
-  lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd"))
+  lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd"))
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(libraryDependencies ++= compile(akkaActor) ++  test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
+    .dependsOn(kamonSystemMetrics % "provided")
  
   lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog"))
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
+    .settings(libraryDependencies ++= compile(akkaActor) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop))
+    .dependsOn(kamonCore)
+    .dependsOn(kamonSystemMetrics % "provided")
+
+  lazy val kamonLogReporter = Project("kamon-log-reporter", file("kamon-log-reporter"))
+    .settings(basicSettings: _*)
+    .settings(formatSettings: _*)
     .settings(libraryDependencies ++= compile(akkaActor) ++  test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
+    .dependsOn(kamonSystemMetrics % "provided")
 
+  lazy val kamonMacros = Project("kamon-macros", file("kamon-macros"))
+    .settings(basicSettings: _*)
+    .settings(formatSettings: _*)
+    .settings(noPublishing: _*)
+    .settings(libraryDependencies ++= compile(scalaCompiler))
+
+  lazy val kamonSystemMetrics = Project("kamon-system-metrics", file("kamon-system-metrics"))
+      .settings(basicSettings: _*)
+      .settings(formatSettings: _*)
+      .settings(libraryDependencies ++= compile(sigar) ++ test(scalatest, akkaTestKit, slf4Api, slf4nop))
+      .settings(fork in Test :=  true)
+      .dependsOn(kamonCore)
 
   val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
 }
diff --git a/project/Settings.scala b/project/Settings.scala
index 3f5f669e..5f489239 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -8,10 +8,15 @@ import scalariform.formatter.preferences._
 
 object Settings {
 
-  lazy val basicSettings = seq(
-    scalaVersion  := "2.11.1",
+  val ScalaVersion = "2.11.1"
+
+  lazy val basicSettings = Seq(
+    scalaVersion  := ScalaVersion,
     resolvers    ++= Dependencies.resolutionRepos,
     fork in run   := true,
+    javacOptions  := Seq(
+      "-source", "1.6", "-target", "1.6"
+    ),
     scalacOptions := Seq(
       "-encoding",
       "utf8",
@@ -23,7 +28,7 @@ object Settings {
       "-language:postfixOps",
       "-language:implicitConversions",
       "-Xlog-reflective-calls"
-    )) ++ publishSettings ++ releaseSettings ++ net.virtualvoid.sbt.graph.Plugin.graphSettings
+    )) ++ publishSettings ++ releaseSettings
 
   lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq(
     ScalariformKeys.preferences in Compile := formattingPreferences,
@@ -33,7 +38,7 @@ object Settings {
   def formattingPreferences =
     FormattingPreferences()
       .setPreference(RewriteArrowSymbols, true)
-      .setPreference(AlignParameters, true)
+      .setPreference(AlignParameters, false)
       .setPreference(AlignSingleLineCaseStatements, true)
       .setPreference(DoubleIndentClassDeclaration, true)
 }
\ No newline at end of file