Merge pull request #564 from benmccann/scala-2.10.5

Use Scala 2.10.5 so that we don't hit SI-7439 as reported in #557 by @justinsb
sbt · Apr 29, 2015 · bf58c76 · bf58c76
2 parents cff7219 + f17c82f
commit bf58c76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
 script:
   - sbt ++$TRAVIS_SCALA_VERSION --warn update compile test:compile && sbt ++$TRAVIS_SCALA_VERSION test "scripted rpm/* debian/* universal/* jar/*"
 scala:
-  - 2.10.3
+  - 2.10.5
 jdk:
   - openjdk7
   - oraclejdk8

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import scalariform.formatter.preferences._
 
 sbtPlugin := true
 
-scalaVersion in Global := "2.10.2"
+scalaVersion in Global := "2.10.5"
 
 name := "sbt-native-packager"