From 0fd0c66adcf1226ee5947cdaa5629bf59c4123f1 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 12 Dec 2017 14:33:48 -0800
Subject: Bump scala and plugins. (#694)

---
 build.sbt            | 4 ++--
 project/assembly.sbt | 2 +-
 project/plugins.sbt  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 637e2390..13afd3c3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,9 +16,9 @@ name := "firrtl"
 
 version := "1.1-SNAPSHOT"
 
-scalaVersion := "2.11.11"
+scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.11.11", "2.12.3")
+crossScalaVersions := Seq("2.11.12", "2.12.4")
 
 def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
   Seq() ++ {
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 15a88b09..652a3b93 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6e7a9d28..b9cce1f7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -6,7 +6,7 @@ resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
 
-- 
cgit v1.2.3