aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnak <ivantopo@gmail.com>2013-05-15 18:47:22 -0300
committerIvan Topolnak <ivantopo@gmail.com>2013-05-15 18:47:22 -0300
commit83e51763db4da386fb22b670aab9b0c2beda20d2 (patch)
treeb6bd0f1a63fd02e75208e6a6cec21dc1724b9b55 /project
parentee1b12e22a502308a26208f87132f08d356d1e1e (diff)
downloadKamon-83e51763db4da386fb22b670aab9b0c2beda20d2.tar.gz
Kamon-83e51763db4da386fb22b670aab9b0c2beda20d2.tar.bz2
Kamon-83e51763db4da386fb22b670aab9b0c2beda20d2.zip
wip
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala4
-rw-r--r--project/Dependencies.scala33
-rw-r--r--project/Settings.scala9
-rw-r--r--project/plugins.sbt2
4 files changed, 30 insertions, 18 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 49366bd5..13afe956 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -5,12 +5,12 @@ object Build extends Build {
import Dependencies._
import Settings._
-
lazy val root = Project("kamon", file("."))
.settings(basicSettings: _*)
+ .settings(revolverSettings: _*)
.settings(
libraryDependencies ++=
- compile(akkaActor, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, newrelic, metricsScala) ++
+ compile(akkaActor, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, newrelic, metricsScala, sprayJson) ++
test(scalatest, sprayTestkit))
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d64626f2..5474228f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -7,22 +7,23 @@ object Dependencies {
"spray nightlies repo" at "http://nightlies.spray.io"
)
- val sprayCan = "io.spray" % "spray-can" % "1.1-M7"
- val sprayRouting = "io.spray" % "spray-routing" % "1.1-M7"
- val sprayTestkit = "io.spray" % "spray-testkit" % "1.1-M7"
- val sprayClient = "io.spray" % "spray-client" % "1.1-M7"
- val sprayServlet = "io.spray" % "spray-servlet" % "1.1-M7"
- val scalaReflect = "org.scala-lang" % "scala-reflect" % "2.10.1"
- val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.1.2"
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.1.2"
- val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.1.2"
- val scalatest = "org.scalatest" %% "scalatest" % "1.9.1"
- val logback = "ch.qos.logback" % "logback-classic" % "1.0.10"
- val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2"
- val metrics = "com.yammer.metrics" % "metrics-core" % "2.2.0"
- val metricsScala = "com.yammer.metrics" % "metrics-scala_2.9.1" % "2.2.0"
- val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "2.17.2"
-
+ val sprayCan = "io.spray" % "spray-can" % "1.1-20130509"
+ val sprayRouting = "io.spray" % "spray-routing" % "1.1-20130509"
+ val sprayTestkit = "io.spray" % "spray-testkit" % "1.1-20130509"
+ val sprayClient = "io.spray" % "spray-client" % "1.1-20130509"
+ val sprayServlet = "io.spray" % "spray-servlet" % "1.1-20130509"
+ val sprayJson = "io.spray" %% "spray-json" % "1.2.3"
+ val scalaReflect = "org.scala-lang" % "scala-reflect" % "2.10.1"
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.1.2"
+ val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.1.2"
+ val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.1.2"
+ val scalatest = "org.scalatest" %% "scalatest" % "1.9.1"
+ val logback = "ch.qos.logback" % "logback-classic" % "1.0.10"
+ val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2"
+ val metrics = "com.yammer.metrics" % "metrics-core" % "2.2.0"
+ val metricsScala = "com.yammer.metrics" % "metrics-scala_2.9.1" % "2.2.0"
+ val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "2.17.2"
+ val playJson = "play" % "play-json" % "2.2-SNAPSHOT"
def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile")
diff --git a/project/Settings.scala b/project/Settings.scala
index e878e881..7eddda5f 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -1,5 +1,6 @@
import sbt._
import Keys._
+import spray.revolver.RevolverPlugin.Revolver
object Settings {
val VERSION = "0.1-SNAPSHOT"
@@ -21,5 +22,13 @@ object Settings {
"-Xlog-reflective-calls"
)
)
+
+
+ import spray.revolver.RevolverPlugin.Revolver._
+ lazy val revolverSettings = Revolver.settings ++ seq(
+ reJRebelJar := "~/.jrebel/jrebel.jar"
+ )
+
+
}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 91cadf24..34921388 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,3 +2,5 @@ resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositori
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
+