From e9578bca5ea7368bbc484fdd83e13fcaf4138e1f Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Mon, 12 Feb 2018 17:58:48 -0800
Subject: Bump sbt to 1.1.1 and bump plugins (#739)

Also move all plugins to project/plugins.sbt---
 project/assembly.sbt     | 1 -
 project/build.properties | 2 +-
 project/plugins.sbt      | 4 ++++
 project/sbt-antlr4.sbt   | 1 -
 4 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 project/assembly.sbt
 delete mode 100644 project/sbt-antlr4.sbt

diff --git a/project/assembly.sbt b/project/assembly.sbt
deleted file mode 100644
index 652a3b93..00000000
--- a/project/assembly.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
diff --git a/project/build.properties b/project/build.properties
index 394cb75c..31334bbd 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 362943d7..40490350 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -15,3 +15,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
+
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
+
+addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.1")
diff --git a/project/sbt-antlr4.sbt b/project/sbt-antlr4.sbt
deleted file mode 100644
index 0489816f..00000000
--- a/project/sbt-antlr4.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.0")
-- 
cgit v1.2.3