aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorDiego Parra <diegolparra@gmail.com>2013-08-23 04:19:17 -0300
committerDiego Parra <diegolparra@gmail.com>2013-08-23 04:19:17 -0300
commitb03b74291b60e9882e815d7823221eacbbf3cfca (patch)
treeb14e9c8835515fe342b13eb40f4fa81eaf46fec1 /project
parent5f12ee932b1d5ba28b775058fe35f8d7ba16b1bf (diff)
downloadKamon-b03b74291b60e9882e815d7823221eacbbf3cfca.tar.gz
Kamon-b03b74291b60e9882e815d7823221eacbbf3cfca.tar.bz2
Kamon-b03b74291b60e9882e815d7823221eacbbf3cfca.zip
WIP:first implementation of Kamon Dashboard
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala11
-rw-r--r--project/Dependencies.scala21
-rw-r--r--project/plugins.sbt4
3 files changed, 21 insertions, 15 deletions
diff --git a/project/Build.scala b/project/Build.scala
index c2822185..879cc1c0 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -8,7 +8,7 @@ object Build extends Build {
import Dependencies._
lazy val root = Project("root", file("."))
- .aggregate(kamonCore, kamonUow)
+ .aggregate(kamonCore, kamonUow, kamonDashboard)
.settings(basicSettings: _*)
lazy val kamonCore = Project("kamon-core", file("kamon-core"))
@@ -21,10 +21,15 @@ object Build extends Build {
libraryDependencies ++=
compile(akkaActor, akkaAgent, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, sprayJson) ++
test(scalatest, akkaTestKit, sprayTestkit))
+ //.dependsOn(kamonDashboard)
lazy val kamonUow = Project("kamon-uow", file("kamon-uow"))
.settings(basicSettings: _*)
- .settings(libraryDependencies ++=
- compile(akkaActor, akkaSlf4j, sprayRouting))
+ .settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting))
+ .dependsOn(kamonCore)
+
+ lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard"))
+ .settings(basicSettings: _*)
+ .settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting, sprayCan, sprayJson))
.dependsOn(kamonCore)
} \ No newline at end of file
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c3162065..028004e1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -7,17 +7,20 @@ object Dependencies {
"spray nightlies repo" at "http://nightlies.spray.io"
)
- val sprayCan = "io.spray" % "spray-can" % "1.1-M8"
- val sprayRouting = "io.spray" % "spray-routing" % "1.1-M8"
- val sprayTestkit = "io.spray" % "spray-testkit" % "1.1-M8"
- val sprayClient = "io.spray" % "spray-client" % "1.1-M8"
- val sprayServlet = "io.spray" % "spray-servlet" % "1.1-M8"
+ val sprayVersion = "1.2-20130801"
+ val akkaVersion = "2.2.0"
+
+ val sprayCan = "io.spray" % "spray-can" % sprayVersion
+ val sprayRouting = "io.spray" % "spray-routing" % sprayVersion
+ val sprayTestkit = "io.spray" % "spray-testkit" % sprayVersion
+ val sprayClient = "io.spray" % "spray-client" % sprayVersion
+ val sprayServlet = "io.spray" % "spray-servlet" % sprayVersion
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.2.0"
- val akkaAgent = "com.typesafe.akka" %% "akka-agent" % "2.2.0"
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.2.0"
- val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.2.0"
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
+ val akkaAgent = "com.typesafe.akka" %% "akka-agent" % akkaVersion
+ val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
+ val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion
val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0.M6-SNAP22"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.10"
val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b8910961..6d9e3bc1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -6,6 +6,4 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0")
-addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1")
-
-
+addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1") \ No newline at end of file