diff options
| author | Chris Rebert <github@chrisrebert.com> | 2016-06-28 08:00:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 08:00:45 +0300 |
| commit | e6dcf24c41a8e84ac7401421e750a3d45f6c3c81 (patch) | |
| tree | eb22aabb779ff8229570ac48b36d2a876bc64ade | |
| parent | a9506b5edbca7aafae2287d181a1a8dc141613fb (diff) | |
| parent | f9395b321a8ed2ed1729827d2ee4940dfe421a47 (diff) | |
Merge pull request #38 from twbs/bump-deps
Update dependencies+tools
| -rw-r--r-- | assembly.sbt | 4 | ||||
| -rw-r--r-- | build.sbt | 6 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/assembly.sbt b/assembly.sbt deleted file mode 100644 index 473f907..0000000 --- a/assembly.sbt +++ /dev/null @@ -1,4 +0,0 @@ -import AssemblyKeys._ - -assemblySettings - @@ -2,7 +2,7 @@ name := "rorschach" version := "1.0" -scalaVersion := "2.11.5" +scalaVersion := "2.11.8" mainClass := Some("com.getbootstrap.rorschach.server.Boot") @@ -21,7 +21,7 @@ libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.2" libraryDependencies ++= { val akkaV = "2.3.9" - val sprayV = "1.3.2" + val sprayV = "1.3.3" Seq( "io.spray" %% "spray-can" % sprayV, "io.spray" %% "spray-routing" % sprayV, @@ -29,7 +29,7 @@ libraryDependencies ++= { "com.typesafe.akka" %% "akka-actor" % akkaV, "com.typesafe.akka" %% "akka-slf4j" % akkaV, "com.typesafe.akka" %% "akka-testkit" % akkaV % "test", - "org.specs2" %% "specs2" % "2.3.12" % "test" + "org.specs2" %% "specs2-core" % "3.8.4" % "test" ) } diff --git a/project/build.properties b/project/build.properties index 817bc38..43b8278 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index 49c4f3e..d7757b8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2") +addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") |