From 0a3a891f4df5dc00622a6dd37e82e6a7eae539a7 Mon Sep 17 00:00:00 2001
From: Juan Pedro Moreno <juanpmorest@gmail.com>
Date: Wed, 6 Jun 2018 23:55:20 +0200
Subject: [PATCH] Upgrades scala and sbt versions

---
 project/ProjectPlugin.scala | 2 ++
 project/build.properties    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index 41cbaa3bb..234efb9cc 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -199,6 +199,8 @@ object ProjectPlugin extends AutoPlugin {
     // format: OFF
     scalaMetaSettings ++ sharedReleaseProcess ++ warnUnusedImport ++ Seq(
       libraryDependencies ++= commonDeps :+ %("slf4j-nop") % Test,
+      scalaVersion := "2.12.6",
+      crossScalaVersions := Seq("2.11.12", "2.12.6"),
       Test / fork := true,
       Tut / scalacOptions -= "-Ywarn-unused-import",
       orgAfterCISuccessTaskListSetting ~= (_.filterNot(_ == defaultPublishMicrosite)),
diff --git a/project/build.properties b/project/build.properties
index 90e7013b8..5a1b382ff 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.1.4
+sbt.version = 1.1.6