diff options
| author | Chris Rebert <github@chrisrebert.com> | 2016-07-08 10:30:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 10:30:09 +0300 |
| commit | 9bb32854ba5863d6ef49f0a7d2f332ec46b3b117 (patch) | |
| tree | ffeeaed027b30e38207513282af36555d77145e3 | |
| parent | 4a3d3b4b8c37baa52dfcf958ba26b6cd28e64fcf (diff) | |
| parent | dee11b91b7fdc032723c4238fee0ab87ff3d9f95 (diff) | |
Merge pull request #38 from twbs/bump-deps
Update dependencies & tools
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | assembly.sbt | 4 | ||||
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 6155f19..75d0cf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ sudo: false language: scala scala: - - 2.11.5 + - 2.11.8 script: - - sbt ++2.11.5 test + - sbt ++2.11.8 test # avoid unnecessary cache updates - find $HOME/.sbt -name "*.lock" | xargs rm - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm 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 := "savage" version := "1.0" -scalaVersion := "2.11.5" +scalaVersion := "2.11.8" mainClass := Some("com.getbootstrap.savage.server.Boot") 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") |