diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 18 | ||||
| -rw-r--r-- | project/Publish.scala | 2 | ||||
| -rw-r--r-- | project/Settings.scala | 4 | ||||
| -rw-r--r-- | project/plugins.sbt | 4 |
5 files changed, 16 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index f249b66f..734b0e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ script: - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile - sbt ++$TRAVIS_SCALA_VERSION -Dakka.test.timefactor=1.5 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test scala: - - 2.10.3 + - 2.11.1
\ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 667f8dce..3c2c6d0f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,25 +7,25 @@ object Dependencies { "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) - val sprayVersion = "1.3.1" - val akkaVersion = "2.3.2" + val sprayVersion = "1.3.1-20140423" + val akkaVersion = "2.3.3" val aspectjVersion = "1.7.4" val slf4jVersion = "1.7.6" val playVersion = "2.3.0" val sprayJson = "io.spray" %% "spray-json" % "1.2.6" - val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3" - val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0" + val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.4" + val scalatest = "org.scalatest" % "scalatest_2.11" % "2.1.7" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % aspectjVersion val aspectjWeaver = "org.aspectj" % "aspectjweaver" % aspectjVersion val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.1.0" val snakeYaml = "org.yaml" % "snakeyaml" % "1.13" - val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.2.1" - 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 hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.0.8" + 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 akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion diff --git a/project/Publish.scala b/project/Publish.scala index 5df73228..7e30e151 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -4,7 +4,7 @@ import sbt.Keys._ object Publish { lazy val settings = Seq( - crossPaths := false, + crossPaths := true, pomExtra := kamonPomExtra, publishTo := kamonRepo, organization := "io.kamon", diff --git a/project/Settings.scala b/project/Settings.scala index 9abd5553..3f5f669e 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -9,7 +9,7 @@ import scalariform.formatter.preferences._ object Settings { lazy val basicSettings = seq( - scalaVersion := "2.10.3", + scalaVersion := "2.11.1", resolvers ++= Dependencies.resolutionRepos, fork in run := true, scalacOptions := Seq( @@ -23,7 +23,7 @@ object Settings { "-language:postfixOps", "-language:implicitConversions", "-Xlog-reflective-calls" - )) ++ publishSettings ++ releaseSettings + )) ++ publishSettings ++ releaseSettings ++ net.virtualvoid.sbt.graph.Plugin.graphSettings lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq( ScalariformKeys.preferences in Compile := formattingPreferences, diff --git a/project/plugins.sbt b/project/plugins.sbt index 0d5801c1..855301d1 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 |