Bump sbt to 1.2.6; update dependencies (#940)

* Bump sbt to 1.2.6; update dependencies

* Remove left-over surgery items.

* Add explanation for explicit junit library dependency

2 files changed, 12 insertions, 7 deletions

diff --git a/build.sbt b/build.sbt
index dbb2d562..d4233084 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,9 +16,9 @@ name := "firrtl"
 
 version := "1.2-SNAPSHOT"
 
-scalaVersion := "2.12.4"
+scalaVersion := "2.12.7"
 
-crossScalaVersions := Seq("2.12.4", "2.11.12")
+crossScalaVersions := Seq("2.12.7", "2.11.12")
 
 def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
   Seq() ++ {
@@ -54,19 +54,24 @@ javacOptions ++= javacOptionsVersion(scalaVersion.value)
 
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
+libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0"
 
 libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
+// 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 += "junit" % "junit" % "4.12" % "test"
 
-libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % "test"
+
+libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
 
 libraryDependencies += "com.github.scopt" %% "scopt" % "3.7.0"
 
 libraryDependencies += "net.jcazevedo" %% "moultingyaml" % "0.4.0"
 
-libraryDependencies += "org.json4s" %% "json4s-native" % "3.5.3"
+libraryDependencies += "org.json4s" %% "json4s-native" % "3.6.1"
 
 // Java PB
 
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