From 75360af6d9052a38533a57bcb99545f73081a301 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Wed, 21 Nov 2018 10:19:51 -0800
Subject: Bump sbt to 1.2.6; update dependencies (#941)

* Bump sbt to 1.2.6; update dependencies

* Add explanation for explicit junit library dependency
---
 build.sbt                | 8 ++++++--
 project/build.properties | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index e06d27e6..8b097c18 100644
--- a/build.sbt
+++ b/build.sbt
@@ -93,9 +93,13 @@ lazy val publishSettings = Seq (
 lazy val chiselSettings = Seq (
   name := "chisel3",
 
+// sbt 1.2.6 fails with `Symbol 'term org.junit' is missing from the classpath`
+// when compiling tests under 2.11.12
+// An explicit dependency on junit seems to alleviate this.
   libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % "3.0.1" % "test",
-    "org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
+    "junit" % "junit" % "4.12" % "test",
+    "org.scalatest" %% "scalatest" % "3.0.5" % "test",
+    "org.scalacheck" %% "scalacheck" % "1.14.0" % "test",
     "com.github.scopt" %% "scopt" % "3.7.0"
   ),
 
diff --git a/project/build.properties b/project/build.properties
index 31334bbd..7c58a83a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.2.6
-- 
cgit v1.2.3