Merge pull request #200 from golem131/scala-2.12.0-support

mauricio · web-flow · commit 1e43743ed83f · 2017-01-08T20:03:04.000-03:00
Scala 2.12.1 support
diff --git 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
@@ -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
@@ -1 +1 @@
-sbt.version = 0.13.8
+sbt.version = 0.13.13
