From e10068f5e8c0779b2ede31947728b63f56c66858 Mon Sep 17 00:00:00 2001
From: Mateusz Starzec <starzec.mateusz@gmail.com>
Date: Thu, 22 Dec 2016 18:53:20 +0100
Subject: [PATCH] Scala 2.12 (#56)

---
 .travis.yml              |  4 ++++
 build.sbt                | 10 +++++-----
 project/build.properties |  2 +-
 project/plugins.sbt      |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bd8132..e7c773b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ language: scala
 scala:
   - 2.10.6
   - 2.11.7
+  - 2.12.1
+
+jdk:
+  - oraclejdk8
 
 install:
   - nvm list
diff --git a/build.sbt b/build.sbt
index 02b9dd0..f20cf8c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 name := "RösHTTP root project"
 
-crossScalaVersions := Seq("2.10.6", "2.11.7")
+crossScalaVersions := Seq("2.10.6", "2.11.8")
 
 lazy val root = project.in(file(".")).
 aggregate(scalaHttpJS, scalaHttpJVM)
@@ -10,7 +10,7 @@ lazy val scalaHttp = crossProject.in(file("."))
   .settings(
     name := "roshttp",
     version := "2.0.0-RC1",
-    scalaVersion := "2.11.8",
+    scalaVersion := "2.12.1",
     organization := "fr.hmil",
     licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")),
     homepage := Some(url("http://github.com/hmil/RosHTTP")),
@@ -38,8 +38,8 @@ lazy val scalaHttp = crossProject.in(file("."))
     ),
     pomIncludeRepository := { _ => false },
 
-    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.3",
-    libraryDependencies += "io.monix" %%% "monix" % "2.0.0",
+    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.4",
+    libraryDependencies += "io.monix" %%% "monix" % "2.1.1",
 
     testFrameworks += new TestFramework("utest.runner.Framework")
   )
@@ -48,7 +48,7 @@ lazy val scalaHttp = crossProject.in(file("."))
   )
   .jsSettings(
     // js-specific settings
-    libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.0",
+    libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.1",
 
     jsEnv := NodeJSEnv().value
   )
diff --git a/project/build.properties b/project/build.properties
index a33a80b..a69c953 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,3 +1,3 @@
-sbt.version = 0.13.9
+sbt.version = 0.13.13
 
 set logLevel in Global := Level.Debug
diff --git a/project/plugins.sbt b/project/plugins.sbt
index a3c00d5..d248028 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")