From f75679dd4a9e200636614122a73a18f876a56129 Mon Sep 17 00:00:00 2001
From: golem131 <golem131@gmail.com>
Date: Thu, 3 Nov 2016 17:29:11 +0300
Subject: [PATCH] Scala 2.12.1 support

---
 .travis.yml              | 6 ++++++
 project/Build.scala      | 4 ++--
 project/build.properties | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c1a7a84..378c49d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,12 @@ scala:
 jdk:
   - oraclejdk7
   - oraclejdk8
+
+matrix:
+  include:
+    - scala: 2.12.1
+      jdk: oraclejdk8
+
 services:
   - postgresql
   - mysql
diff --git a/project/Build.scala b/project/Build.scala
index f4fbb02a..e1de52d9 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -51,7 +51,7 @@ object Configuration {
 
   val commonVersion = "0.2.21-SNAPSHOT"
   val projectScalaVersion = "2.11.7"
-  val specs2Version = "3.8.5"
+  val specs2Version = "3.8.6"
 
   val specs2Dependency = "org.specs2" %% "specs2-core" % specs2Version % "test"
   val specs2JunitDependency = "org.specs2" %% "specs2-junit" % specs2Version % "test"
@@ -84,7 +84,7 @@ object Configuration {
     ,
     testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential"),
     scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"),
-    crossScalaVersions := Seq(projectScalaVersion, "2.10.6"),
+    crossScalaVersions := Seq(projectScalaVersion, "2.10.6", "2.12.1"),
     javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"),
     organization := "com.github.mauricio",
     version := commonVersion,
diff --git a/project/build.properties b/project/build.properties
index d638b4f3..e0cbc71d 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.8
\ No newline at end of file
+sbt.version = 0.13.13
\ No newline at end of file