From ff0e441f43c3a3336cd62c9c08281ef9dbd94c23 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 30 Jan 2017 23:07:51 +0100
Subject: [PATCH] Set default scala version to 2.12.1

Rather than 2.11.8
---
 .ci/travis.sh | 2 +-
 build.sbt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/travis.sh b/.ci/travis.sh
index e81ac14dc..f52120f17 100755
--- a/.ci/travis.sh
+++ b/.ci/travis.sh
@@ -28,7 +28,7 @@ function isMasterOrDevelop() {
 }
 
 # Required for ~/.ivy2/local repo tests
-~/sbt coreJVM/publishLocal http-server/publishLocal
+~/sbt ++2.11.8 coreJVM/publishLocal http-server/publishLocal
 
 # Required for HTTP authentication tests
 ./coursier launch \
diff --git a/build.sbt b/build.sbt
index 17e290b61..08e60bd78 100644
--- a/build.sbt
+++ b/build.sbt
@@ -97,7 +97,7 @@ lazy val scalaVersionAgnosticCommonSettings = Seq(
 ) ++ releaseSettings
 
 lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq(
-  scalaVersion := "2.11.8",
+  scalaVersion := "2.12.1",
   crossScalaVersions := Seq("2.12.1", "2.11.8", "2.10.6"),
   libraryDependencies ++= {
     if (scalaBinaryVersion.value == "2.10")