diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-20 00:59:26 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-20 00:59:26 +0200 |
| commit | 290a3c92da938182fe1157efff00d4589203e678 (patch) | |
| tree | 2557796d5c9d63287fdba7a23e51e4e379607f22 | |
| parent | 371011cff23f5fef5c755a29430f8e8d0fef4263 (diff) | |
| download | Kamon-290a3c92da938182fe1157efff00d4589203e678.tar.gz Kamon-290a3c92da938182fe1157efff00d4589203e678.tar.bz2 Kamon-290a3c92da938182fe1157efff00d4589203e678.zip | |
! build: more version upgrades + include sbt-dependency-graph
| -rw-r--r-- | project/Dependencies.scala | 4 | ||||
| -rw-r--r-- | project/Projects.scala | 4 | ||||
| -rw-r--r-- | project/Settings.scala | 3 | ||||
| -rw-r--r-- | project/plugins.sbt | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 354e5cbe..cb0a80ef 100644 --- 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 index 20da3fbc..644e58b1 100644 --- 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 index 0f48b808..306c88a4 100644 --- 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 index 60960203..abd5e2a8 100644 --- 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")
\ No newline at end of file +addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1") + +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
\ No newline at end of file |