Update scalajs versions, related dependencies and remove obsolete features

1 files changed, 21 insertions, 27 deletions

diff --git a/build.sbt b/build.sbt
index 985fb85..237ad49 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,7 @@
 import sbt.Keys._
 
-val scalaJsVersion = "0.6.2"
-
 val defaultSettings = Seq(
+  scalacOptions ++= Seq("-feature", "-deprecation"),
   unmanagedSourceDirectories in Compile += baseDirectory.value /  "shared" / "main" / "scala",
   unmanagedSourceDirectories in Test += baseDirectory.value / "shared" / "test" / "scala"
 )
@@ -11,7 +10,7 @@ lazy val root = project.in(file(".")).settings(defaultSettings:_*).settings(
   name := "workbench",
   version := "0.3.0-SNAPSHOT",
   organization := "com.lihaoyi",
-  scalaVersion := "2.10.5",
+  scalaVersion := "2.10.6",
   sbtPlugin := true,
   publishArtifact in Test := false,
   publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
@@ -39,30 +38,25 @@ lazy val root = project.in(file(".")).settings(defaultSettings:_*).settings(
     (fullOptJS in (client, Compile)).value
     (artifactPath in (client, Compile, fullOptJS)).value
   },
-  resolvers += Resolver.url("scala-js-releases",
-    url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
-    Resolver.ivyStylePatterns),
-  addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.1"),
+  addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13"),
   libraryDependencies ++= Seq(
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-    "io.spray" % "spray-can" % "1.3.1",
-    "io.spray" % "spray-routing" % "1.3.1",
-    "com.typesafe.akka" %% "akka-actor" % "2.3.9",
-    "org.scala-lang.modules" %% "scala-async" % "0.9.3" % "provided",
-    "com.lihaoyi" %% "autowire" % "0.2.5",
-    "com.lihaoyi" %% "upickle" % "0.2.8"
-  ),
-  resolvers += "bintray/non" at "http://dl.bintray.com/non/maven"
+    Dependencies.sprayCan,
+    Dependencies.sprayRouting,
+    Dependencies.akka,
+    Dependencies.autowire.value,
+    Dependencies.upickle.value
+  )
 )
 
-lazy val client = project.in(file("client")).enablePlugins(ScalaJSPlugin)
-                         .settings(defaultSettings: _*)
-                         .settings(
-  unmanagedSourceDirectories in Compile += baseDirectory.value /  ".." / "shared" / "main" / "scala",
-  libraryDependencies ++= Seq(
-    "org.scala-js" %%% "scalajs-dom" % "0.8.0",
-    "com.lihaoyi" %%% "autowire" % "0.2.4",
-    "com.lihaoyi" %%% "upickle" % "0.2.6"
-  ),
-  emitSourceMaps := false
-)
+lazy val client = project.in(file("client"))
+  .enablePlugins(ScalaJSPlugin)
+  .settings(defaultSettings: _*)
+  .settings(
+    unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "shared" / "main" / "scala",
+    libraryDependencies ++= Seq(
+      Dependencies.autowire.value,
+      Dependencies.dom.value,
+      Dependencies.upickle.value
+    ),
+    emitSourceMaps := false
+  )