From f17c82f29fc9851aa5b66459c211c9dd88f48cc9 Mon Sep 17 00:00:00 2001
From: Ben McCann <ben@connectifier.com>
Date: Mon, 27 Apr 2015 14:00:21 -0700
Subject: [PATCH] Use Scala 2.10.5 so that we don't hit SI-7439 as reported in
 #557 by @justinsb

---
 .travis.yml | 2 +-
 build.sbt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 503c4ba01..39e703278 100644
--- 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
index 65dcf86c7..7274b888c 100644
--- 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"