From 8c9c9e2c341c87607d44026b8fc5457409c707b3 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Sat, 27 May 2017 20:34:39 -0700
Subject: Prep for Scala 2.12 (#557)

* Update dependencies and JavaConverters for Scala 2.12

* Bump Scala (and library) version(s).

* replace "error" with "Utils.error"; bump Scala version to 2.11.11
---
 project/assembly.sbt     | 2 +-
 project/build.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'project')

diff --git a/project/assembly.sbt b/project/assembly.sbt
index a815d584..39c1bb84 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
diff --git a/project/build.properties b/project/build.properties
index 35c88bab..64317fda 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.15
-- 
cgit v1.2.3