Merge pull request #374 from ashawley/update-sbt-site

Update sbt-site plugin
sbt · Jun 26, 2017 · 5c32a0a · 5c32a0a
2 parents cdea18b + 9d5070d
commit 5c32a0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 # Use Ubuntu 14.04
 dist: trusty
-# Can't use sudo: false because of travis-ci/travis-ci#7019
-sudo: required
+sudo: false
 language: ruby
 rvm: 2.2.3
 cache:
@@ -15,7 +14,7 @@ script:
   - find $HOME/.sbt -name "*.lock" | xargs rm
   - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
 jdk:
-  - oraclejdk7
+  - openjdk7
 install:
   - gem install nanoc:4.0.2
   - gem install redcarpet

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0-RC2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")