From 8891bf1b644a5e94f5e1cab6c42db610f8c0f328 Mon Sep 17 00:00:00 2001
From: Jack Koenig <jack.koenig3@gmail.com>
Date: Wed, 23 Aug 2017 13:33:22 -0700
Subject: [PATCH] Bump chisel3 and firrtl, update plugin versions

And update chisel3 code
---
 chisel3                               | 2 +-
 firrtl                                | 2 +-
 project/build.properties              | 2 +-
 project/build.scala                   | 2 +-
 project/plugins.sbt                   | 6 +++---
 src/main/scala/jtag/JtagShifter.scala | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chisel3 b/chisel3
index bb12fe7f..e2c5c128 160000
--- a/chisel3
+++ b/chisel3
@@ -1 +1 @@
-Subproject commit bb12fe7f61d12f51cf5d56b2a66aca0a1234abb3
+Subproject commit e2c5c128f6509805f71aeca790809b3e9a8fe84d
diff --git a/firrtl b/firrtl
index f8572ba6..5e23294d 160000
--- a/firrtl
+++ b/firrtl
@@ -1 +1 @@
-Subproject commit f8572ba6532359e8a0f1bc34f3eb8241a29129ab
+Subproject commit 5e23294dc6ac3c1937c9f071f970178c9f724037
diff --git a/project/build.properties b/project/build.properties
index 35c88bab..c091b86c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.16
diff --git a/project/build.scala b/project/build.scala
index e7fa0a79..6d8d1e28 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -11,7 +11,7 @@ object BuildSettings extends Build {
   override lazy val settings = super.settings ++ Seq(
     organization := "berkeley",
     version      := "1.2",
-    scalaVersion := "2.11.7",
+    scalaVersion := "2.11.11",
     parallelExecution in Global := false,
     traceLevel   := 15,
     scalacOptions ++= Seq("-deprecation","-unchecked"),
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c0abe1e6..715be580 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,13 +1,13 @@
 resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
+addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
diff --git a/src/main/scala/jtag/JtagShifter.scala b/src/main/scala/jtag/JtagShifter.scala
index 76633c43..a218fd70 100644
--- a/src/main/scala/jtag/JtagShifter.scala
+++ b/src/main/scala/jtag/JtagShifter.scala
@@ -150,7 +150,7 @@ class CaptureUpdateChain[+T <: Data, +V <: Data](genCapture: T, genUpdate: V) ex
   io.chainOut.data := regs(0)
 
   val updateBits = Cat(regs.reverse)(updateWidth-1, 0)
-  io.update.bits := io.update.bits.fromBits(updateBits)
+  io.update.bits := updateBits.asTypeOf(io.update.bits)
 
   val captureBits = io.capture.bits.asUInt()