From 5d2c956ff38b15b0d650750eea9ef3720f7815a0 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude@laposte.net>
Date: Thu, 26 Mar 2015 00:02:48 +0100
Subject: [PATCH] Upgrade Scala to 2.11.6, scalajs to 0.6.2

---
 build.sbt           | 12 +++++++-----
 project/plugins.sbt |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index be6435a..f33194a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,8 +3,8 @@
 lazy val commonSettings = Seq(
   organization := "biz.enef",
   version := "0.2-SNAPSHOT",
-  scalaVersion := "2.11.5",
-  scalacOptions ++= Seq("-deprecation","-feature","-Xlint"),
+  scalaVersion := "2.11.6",
+  scalacOptions ++= Seq("-deprecation","-unchecked","-feature","-language:implicitConversions","-Xlint"),
   autoCompilerPlugins := true,
   addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.2"),
   libraryDependencies += "com.lihaoyi" %% "acyclic" % "0.1.2" % "provided",
@@ -26,7 +26,7 @@ lazy val root = project.in(file(".")).
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
       "org.scala-js"   %%% "scalajs-dom" % "0.8.0",
-      "be.doeraene" %%% "scalajs-jquery" % "0.8.0"
+      "be.doeraene" %%% "scalajs-jquery" % "0.8.0" % "provided"
     ),
     resolvers += Resolver.sonatypeRepo("releases")
   )
@@ -42,10 +42,11 @@ lazy val tests = project.
     scalaJSStage in Test := FastOptStage,
     testFrameworks += new TestFramework("utest.runner.Framework"),
     requiresDOM := true,
-    libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.0" % "test",
+    libraryDependencies ++= Seq("com.lihaoyi" %%% "utest" % "0.3.0" % "test",
+      "be.doeraene" %%% "scalajs-jquery" % "0.8.0"),
     jsDependencies += RuntimeDOM,
     jsDependencies += "org.webjars" % "angularjs" % "1.3.8" / "angular.min.js" % "test",
-    jsDependencies += "org.webjars" % "angularjs" % "1.3.8" / "angular-mocks.js" % "test"
+    jsDependencies += ("org.webjars" % "angularjs" % "1.3.8" / "angular-mocks.js" dependsOn "angular.min.js") % "test"
   )
 
 
@@ -79,6 +80,7 @@ lazy val publishingSettings = Seq(
       <developer>
         <id>ludovicc</id>
         <name>Ludovic Claude</name>
+        <email>ludovic.claude@laposte.net</email>
       </developer>
     </developers>
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0dd657b..d037d0f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.2")