From 3f2e8cf6cb86e26913bae006fdab1117001b4660 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 21 Aug 2018 13:29:06 -0700
Subject: Make Scala 2.12.4 the default. (#848)

* Bump to Scala 2.12.6 and make it the default.

* Use Scala 2.11.12 for chisel tests.

* Try with Scala 2.12.4.
---
 .run_chisel_tests.sh | 2 +-
 .travis.yml          | 8 ++++----
 build.sbt            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.run_chisel_tests.sh b/.run_chisel_tests.sh
index d52d8c3d..b14d842b 100644
--- a/.run_chisel_tests.sh
+++ b/.run_chisel_tests.sh
@@ -7,5 +7,5 @@ else
   mkdir -p chisel3/lib
   cp utils/bin/firrtl.jar chisel3/lib
   cd chisel3
-  sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 2)" clean test
+  sbt ++2.11.12 "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 2)" clean test
 fi
diff --git a/.travis.yml b/.travis.yml
index 46bd984d..cd94031f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,16 +39,16 @@ jobs:
     - stage: test
       script:
         - verilator --version
-        - sbt ++2.11.12 $SBT_ARGS test
+        - sbt ++2.12.4 $SBT_ARGS test
     - stage: test
       script:
         - verilator --version
-        - sbt ++2.12.4 $SBT_ARGS test
-    # For Chisel tests we just use the default version
+        - sbt ++2.11.12 $SBT_ARGS test
+    # For Chisel tests we use the 2.11.12 version
     - stage: test
       script:
         - verilator --version
-        - sbt $SBT_ARGS clean assembly publishLocal
+        - sbt ++2.11.12 $SBT_ARGS clean assembly publishLocal
         - bash .run_chisel_tests.sh
     - stage: test
       script:
diff --git a/build.sbt b/build.sbt
index 33fb8c03..7b3091e0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,9 +16,9 @@ name := "firrtl"
 
 version := "1.2-SNAPSHOT"
 
-scalaVersion := "2.11.12"
+scalaVersion := "2.12.4"
 
-crossScalaVersions := Seq("2.11.12", "2.12.4")
+crossScalaVersions := Seq("2.12.4", "2.11.12")
 
 def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
   Seq() ++ {
-- 
cgit v1.2.3