Bump sbt (#703)

Bump SBT to 1.0.4 and update plugins
Update Scala versions and sbt commands in .travis.yml
Replace run-main with runMain

6 files changed, 10 insertions, 12 deletions

diff --git a/.travis.yml b/.travis.yml
index 97dbfd4e..519047b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: scala
 scala:
-  - 2.11.11
-  - 2.12.3
+  - 2.11.12
+  - 2.12.4
 sudo: false
 
 cache:
@@ -30,7 +30,7 @@ jobs:
   include:
     - stage: test
       script:
-        - sbt clean assembly publish-local
+        - sbt clean assembly publishLocal
         - bash .run_chisel_tests.sh
     - stage: test
       script:
diff --git a/build.sbt b/build.sbt
index 13afd3c3..16159a0e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -26,7 +26,7 @@ def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
     //  switch to support our anonymous Bundle definitions:
     //  https://github.com/scala/bug/issues/10047
     CrossVersion.partialVersion(scalaVersion) match {
-      case Some((2, scalaMajor: Int)) if scalaMajor < 12 => Seq()
+      case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq()
       case _ => Seq("-Xsource:2.11")
     }
   }
@@ -40,7 +40,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
     //  Java 7 compatible code until we need Java 8 features
     //  for compatibility with old clients.
     CrossVersion.partialVersion(scalaVersion) match {
-      case Some((2, scalaMajor: Int)) if scalaMajor < 12 =>
+      case Some((2, scalaMajor: Long)) if scalaMajor < 12 =>
         Seq("-source", "1.7", "-target", "1.7")
       case _ =>
         Seq("-source", "1.8", "-target", "1.8")
@@ -74,7 +74,7 @@ assemblyOutputPath in assembly := file("./utils/bin/firrtl.jar")
 
 // ANTLRv4
 
-antlr4Settings
+enablePlugins(Antlr4Plugin)
 
 antlr4GenVisitor in Antlr4 := true // default = false
 
diff --git a/project/build.properties b/project/build.properties
index c091b86c..394cb75c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.0.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b9cce1f7..362943d7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -14,4 +14,4 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
diff --git a/project/sbt-antlr4.sbt b/project/sbt-antlr4.sbt
index cd995cc3..0489816f 100644
--- a/project/sbt-antlr4.sbt
+++ b/project/sbt-antlr4.sbt
@@ -1,3 +1 @@
-resolvers += Resolver.url("bintray-simplytyped", url("http://dl.bintray.com/simplytyped/sbt-plugins"))(Resolver.ivyStylePatterns)
-
-addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.12")
+addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.0")
diff --git a/scripts/formal_equiv.sh b/scripts/formal_equiv.sh
index 2e9fa74d..407ae753 100755
--- a/scripts/formal_equiv.sh
+++ b/scripts/formal_equiv.sh
@@ -26,7 +26,7 @@ make_verilog () {
     local filename="$DUT.$1.v"
 
     sbt clean
-    sbt "run-main firrtl.Driver -i $DUT.fir -o $filename -X verilog"
+    sbt "runMain firrtl.Driver -i $DUT.fir -o $filename -X verilog"
     RET=$filename
 }