From 86f3b9ac53f0785502bb688f10931a7ffdb80d80 Mon Sep 17 00:00:00 2001
From: Juan Pedro Moreno <4879373+juanpedromoreno@users.noreply.github.com>
Date: Thu, 7 Jun 2018 11:46:26 +0200
Subject: [PATCH] Upgrade to Scala 2.12.6 (#554)

* Upgrades the build, including Scala 2.12.6 and Sbt 1.1.6

* Releases freestyle 0.8.2

* Updates scala version in travis.yml file
---
 .travis.yml                 | 2 +-
 project/ProjectPlugin.scala | 4 +++-
 project/build.properties    | 2 +-
 project/plugins.sbt         | 2 +-
 version.sbt                 | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69a49aa8..0b96d3c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 
 scala:
 - 2.11.12
-- 2.12.4
+- 2.12.6
 
 env:
 - SCALAENV=jvm
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
index bf52829f..9a92b7ae 100644
--- a/project/ProjectPlugin.scala
+++ b/project/ProjectPlugin.scala
@@ -82,7 +82,9 @@ object ProjectPlugin extends AutoPlugin {
     Seq(
       orgUpdateDocFilesSetting += baseDirectory.value / "docs" / "src",
       orgScriptTaskListSetting := List("validate".asRunnableItemFull),
-      coverageExcludedPackages := "<empty>;todo\\..*;freeslick\\..*"
+      coverageExcludedPackages := "<empty>;todo\\..*;freeslick\\..*",
+      scalaVersion := "2.12.6",
+      crossScalaVersions := Seq("2.11.12", "2.12.6")
     ) ++ scalaMetaSettings ++ sharedReleaseProcess
 
 }
diff --git a/project/build.properties b/project/build.properties
index 394cb75c..d6e35076 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1a9faea4..2f179f26 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
 resolvers += Resolver.sonatypeRepo("releases")
 
-addSbtPlugin("io.frees"        % "sbt-freestyle"   % "0.3.21")
+addSbtPlugin("io.frees"        % "sbt-freestyle"   % "0.3.23")
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1")
diff --git a/version.sbt b/version.sbt
index edbf98c4..38060a7b 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.8.2-SNAPSHOT"
\ No newline at end of file
+version in ThisBuild := "0.8.2"
\ No newline at end of file