! build: more version upgrades + include sbt-dependency-graph

kamon-io · Oct 19, 2014 · 290a3c9 · 290a3c9
1 parent 371011c
commit 290a3c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,9 +9,9 @@ object Dependencies {
 
   val sprayVersion    = "1.3.2"
   val akkaVersion     = "2.3.6"
-  val aspectjVersion  = "1.7.4"
+  val aspectjVersion  = "1.8.1"
   val slf4jVersion    = "1.7.6"
-  val playVersion     = "2.3.4"
+  val playVersion     = "2.3.5"
 
   val sprayJson       = "io.spray"                  %%  "spray-json"            % "1.3.0"
   val sprayJsonLenses = "net.virtual-void"          %%  "json-lenses"           % "0.5.4"

diff --git a/project/Projects.scala b/project/Projects.scala
@@ -23,8 +23,8 @@ object Projects extends Build {
       mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value,
       mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value,
       libraryDependencies ++=
-        compile(akkaActor, aspectJ, hdrHistogram, scalazConcurrent) ++
-        optional(akkaRemote, akkaCluster, logback, aspectjWeaver) ++
+        compile(akkaActor, aspectJ, hdrHistogram) ++
+        optional(akkaRemote, akkaCluster, logback, scalazConcurrent, aspectjWeaver) ++
         test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback))
 
 

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -5,6 +5,7 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import Publish.{settings => publishSettings}
 import Release.{settings => releaseSettings}
 import scalariform.formatter.preferences._
+import net.virtualvoid.sbt.graph.Plugin.graphSettings
 
 object Settings {
 
@@ -29,7 +30,7 @@ object Settings {
       "-language:postfixOps",
       "-language:implicitConversions",
       "-Xlog-reflective-calls"
-    )) ++ publishSettings ++ releaseSettings
+    )) ++ publishSettings ++ releaseSettings ++ graphSettings
 
   lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq(
     ScalariformKeys.preferences in Compile := formattingPreferences,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -12,4 +12,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
+
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")