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

Conflicts:
	.travis.yml
	project/Dependencies.scala

3 files changed, 5 insertions, 32 deletions

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 879a3a76..3c2c6d0f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,6 +11,7 @@ object Dependencies {
   val akkaVersion     = "2.3.3"
   val aspectjVersion  = "1.7.4"
   val slf4jVersion    = "1.7.6"
+  val playVersion     = "2.3.0"
 
   val sprayJson       = "io.spray"                  %%  "spray-json"            % "1.2.6"
   val sprayJsonLenses = "net.virtual-void"          %%  "json-lenses"           % "0.5.4"
@@ -28,6 +29,8 @@ object Dependencies {
   val akkaActor       = "com.typesafe.akka"         %%  "akka-actor"            % akkaVersion
   val akkaSlf4j       = "com.typesafe.akka"         %%  "akka-slf4j"            % akkaVersion
   val akkaTestKit     = "com.typesafe.akka"         %%  "akka-testkit"          % akkaVersion
+  val play            = "com.typesafe.play"         %%  "play"                  % playVersion
+  val playWS          = "com.typesafe.play"         %%  "play-ws"               % playVersion
   val playTest        = "org.scalatestplus"         %%  "play"                  % "1.1.0"
   val slf4Api         = "org.slf4j"                 %   "slf4j-api"             % slf4jVersion
   val slf4nop         = "org.slf4j"                 %   "slf4j-nop"             % slf4jVersion
diff --git a/project/Projects.scala b/project/Projects.scala
index f51cada6..e8675186 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -4,11 +4,10 @@ import Keys._
 object Projects extends Build {
   import AspectJ._
   import Settings._
-  import Site._
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsd, site)
+    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsd)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
@@ -74,7 +73,7 @@ object Projects extends Build {
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
-    .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, akkaTestKit, slf4Api))
+    .settings(libraryDependencies ++= compile(play, playWS, aspectJ) ++ test(playTest, akkaTestKit, slf4Api))
     .dependsOn(kamonCore)
 
   lazy val kamonStatsd = Project("kamon-statsd", file("kamon-statsd"))
@@ -89,17 +88,6 @@ object Projects extends Build {
     .settings(libraryDependencies ++= compile(akkaActor) ++  test(scalatest, akkaTestKit, slf4Api, slf4nop))
     .dependsOn(kamonCore)
 
-  lazy val site = Project("site", file("site"))
-    .settings(basicSettings: _*)
-    .settings(siteSettings: _*)
-    .settings(aspectJSettings: _*)
-    .settings(noPublishing: _*)
-    .dependsOn(kamonCore)
-    .settings(
-      libraryDependencies ++=
-        compile(akkaSlf4j, logback) ++
-        test(scalatest, akkaTestKit))
-
 
   val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false)
 }
diff --git a/project/Site.scala b/project/Site.scala
deleted file mode 100644
index cf34353b..00000000
--- a/project/Site.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-import sbt._
-import sbt.Keys._
-
-object Site {
-  val serveSite = taskKey[Unit]("Start a embedded web server with access to the site.")
-  val jekyllSource = settingKey[File]("Location of jekyll sources.")
-
-  val siteSettings = Seq(
-    jekyllSource := sourceDirectory.value / "main" / "jekyll",
-    serveSite    := {
-      val command = "jekyll serve --watch --trace --detach" +
-        " --source " + jekyllSource.value.absolutePath +
-        " --destination " + (target.value / "_site").absolutePath
-
-      sbt.Process(command, jekyllSource.value, ("LC_ALL", "en_US.UTF-8")).run
-    }
-  )
-}
\ No newline at end of file