From 923b88e8adef2f66b43e551fa4a0a1bbae5af7ff Mon Sep 17 00:00:00 2001
From: Ivan Topolnak <ivantopo@gmail.com>
Date: Wed, 7 Aug 2013 19:06:33 -0300
Subject: upgrading to akka 2.2

---
 project/Build.scala    | 12 ++++++++++--
 project/Settings.scala |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'project')

diff --git a/project/Build.scala b/project/Build.scala
index 7d89713c..c2822185 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -7,7 +7,11 @@ object Build extends Build {
   import Settings._
   import Dependencies._
 
-  lazy val root = Project("kamon", file("."))
+  lazy val root = Project("root", file("."))
+    .aggregate(kamonCore, kamonUow)
+    .settings(basicSettings: _*)
+
+  lazy val kamonCore = Project("kamon-core", file("kamon-core"))
     .settings(basicSettings: _*)
     .settings(revolverSettings: _*)
     .settings(aspectJSettings: _*)
@@ -18,5 +22,9 @@ object Build extends Build {
         compile(akkaActor, akkaAgent, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, metrics, sprayJson) ++
         test(scalatest, akkaTestKit, sprayTestkit))
 
-
+  lazy val kamonUow = Project("kamon-uow", file("kamon-uow"))
+    .settings(basicSettings: _*)
+    .settings(libraryDependencies ++=
+      compile(akkaActor, akkaSlf4j, sprayRouting))
+    .dependsOn(kamonCore)
 }
\ No newline at end of file
diff --git a/project/Settings.scala b/project/Settings.scala
index 640a8013..5fadc25d 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -7,8 +7,8 @@ object Settings {
 
   lazy val basicSettings = seq(
     version       := VERSION,
-    organization  := "com.despegar",
-    scalaVersion  := "2.10.0",
+    organization  := "kamon",
+    scalaVersion  := "2.10.2",
     resolvers    ++= Dependencies.resolutionRepos,
     fork in run   := true,
     scalacOptions := Seq(
-- 
cgit v1.2.3