upgrade to sbt 0.13.1

8 files changed, 22 insertions, 57 deletions

diff --git a/project/AspectJ.scala b/project/AspectJ.scala
index 83b334b8..711ce98b 100644
--- a/project/AspectJ.scala
+++ b/project/AspectJ.scala
@@ -1,12 +1,13 @@
 import sbt._
 import sbt.Keys._
-import com.typesafe.sbt.SbtAspectj.{ Aspectj, aspectjSettings, compiledClasses }
-import com.typesafe.sbt.SbtAspectj.AspectjKeys.{ binaries, compileOnly, inputs, lintProperties, weaverOptions }
+import com.typesafe.sbt.SbtAspectj.{ Aspectj, aspectjSettings }
+import com.typesafe.sbt.SbtAspectj.AspectjKeys.{ aspectjVersion, compileOnly, lintProperties, weaverOptions }
 
 
 object AspectJ {
 
   lazy val aspectJSettings = aspectjSettings ++ Seq(
+              aspectjVersion    :=  Dependencies.aspectjVersion,
       compileOnly in Aspectj    :=  true,
                 fork in Test    :=  true,
          javaOptions in Test  <++=  weaverOptions in Aspectj,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 82375632..1aefcf4b 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,9 +3,8 @@ import sbt._
 object Dependencies {
 
   val resolutionRepos = Seq(
-              "spray repo"  at "http://repo.spray.io/",
-              "spray nightlies repo"  at "http://nightlies.spray.io",
-              "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/"
+       "spray repo" at "http://repo.spray.io/",
+    "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/"
   )
 
   val sprayVersion    = "1.2.0"
diff --git a/project/NewRelic.scala b/project/NewRelic.scala
deleted file mode 100644
index cb26c38c..00000000
--- a/project/NewRelic.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import sbt._
-import sbt.Keys._
-import com.ivantopo.sbt.newrelic.SbtNewrelic
-import com.ivantopo.sbt.newrelic.SbtNewrelic.newrelic
-import com.ivantopo.sbt.newrelic.SbtNewrelic.SbtNewrelicKeys._
-
-
-object NewRelic {
-
-  lazy val newrelicSettings =  SbtNewrelic.newrelicSettings ++ Seq(
-             javaOptions in run   <++=  jvmOptions in newrelic,
-                    fork in run     :=  true,
-         configFile in newrelic     := file(System.getProperty("user.home") + "/.newrelic/kamon_playground.yml"),
-    newrelicVersion in newrelic     :=  "3.1.0"
-  )
-}
diff --git a/project/Build.scala b/project/Projects.scala
index 1d9046cd..ad04e60a 100644
--- a/project/Build.scala
+++ b/project/Projects.scala
@@ -1,15 +1,14 @@
 import sbt._
 import Keys._
 
-object Build extends Build {
+object Projects extends Build {
   import AspectJ._
-  import NewRelic._
   import Settings._
   import Site._
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay)
+    .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, site)
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
     .settings(noPublishing: _*)
@@ -51,8 +50,6 @@ object Build extends Build {
   lazy val kamonPlayground = Project("kamon-playground", file("kamon-playground"))
     .settings(basicSettings: _*)
     .settings(formatSettings: _*)
-    .settings(revolverSettings: _*)
-    .settings(newrelicSettings: _*)
     .settings(noPublishing: _*)
     .settings(
       libraryDependencies ++=
diff --git a/project/Settings.scala b/project/Settings.scala
index 16ab04ad..9b6c917d 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -1,11 +1,9 @@
 import sbt._
 import Keys._
-import spray.revolver.RevolverPlugin.Revolver
 import sbtrelease.ReleasePlugin._
 import com.typesafe.sbt.SbtScalariform
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import Publish.{settings => publishSettings}
-import spray.revolver.RevolverPlugin.Revolver._
 import scalariform.formatter.preferences._
 
 object Settings {
@@ -27,8 +25,6 @@ object Settings {
       "-Xlog-reflective-calls"
     )) ++ publishSettings ++ releaseSettings
 
-  lazy val revolverSettings = Revolver.settings
-
   lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq(
     ScalariformKeys.preferences in Compile := formattingPreferences,
     ScalariformKeys.preferences in Test    := formattingPreferences
diff --git a/project/Site.scala b/project/Site.scala
index 6cda22bd..cf34353b 100644
--- a/project/Site.scala
+++ b/project/Site.scala
@@ -1,24 +1,18 @@
 import sbt._
 import sbt.Keys._
-import com.typesafe.sbt.site.JekyllSupport._
-import com.typesafe.sbt.SbtSite._
 
 object Site {
-  val siteSettings = site.settings ++ site.jekyllSupport() ++
-    inConfig(Jekyll)(Seq(
-      RequiredGems  :=  Map("jekyll" -> "1.3.0", "liquid" -> "2.5.4"),
-          mappings <<=  (sourceDirectory, target, includeFilter, CheckGems, streams) map {
-                          (src, t, inc, _, s) => buildJekyll(src, t, inc, s) } ))
+  val serveSite = taskKey[Unit]("Start a embedded web server with access to the site.")
+  val jekyllSource = settingKey[File]("Location of jekyll sources.")
 
-  def buildJekyll(src: File, target: File, inc: FileFilter, s: TaskStreams): Seq[(File, String)] = {
-    // Run Jekyll
-    sbt.Process(Seq("jekyll", "build", "--destination", target.getAbsolutePath), Some(src)) ! s.log match {
-      case 0 => ()
-      case n => sys.error("Could not run jekyll, error: " + n)
+  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
     }
-    // Figure out what was generated.
-    for {
-      (file, name) <- (target ** inc x relativeTo(target))
-    } yield file -> name
-  }
+  )
 }
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index db255c25..638d14ee 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.3
\ No newline at end of file
+sbt.version=0.13.1
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 33519318..0e71f446 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,17 +2,11 @@ resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositori
 
 resolvers += "Kamon Releases" at "http://repo.kamon.io"
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
-
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.4")
 
-addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1")
-
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.1")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")