First shot at updating Scala.js

1 files changed, 13 insertions, 14 deletions

diff --git a/build.sbt b/build.sbt
index e77fd6a..70c96e9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 import sbt.Keys._
-import scala.scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
+
+val scalaJsVersion = "0.6.1"
 
 val defaultSettings = Seq(
   unmanagedSourceDirectories in Compile <+= baseDirectory(_ /  "shared" / "main" / "scala"),
@@ -42,28 +42,27 @@ lazy val root = project.in(file(".")).settings(defaultSettings:_*).settings(
   resolvers += Resolver.url("scala-js-releases",
     url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(
       Resolver.ivyStylePatterns),
-  addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.4"),
+  addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJsVersion),
   libraryDependencies ++= Seq(
     "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-    "org.scala-lang.modules.scalajs" % s"scalajs-compiler_${scalaVersion.value}" % "0.5.4",
-    "org.scala-lang.modules.scalajs" %% "scalajs-tools" % "0.5.4",
     "io.spray" % "spray-can" % "1.3.1",
     "io.spray" % "spray-routing" % "1.3.1",
-    "com.typesafe.akka" %% "akka-actor" % "2.3.0",
-    "org.scala-lang.modules" %% "scala-async" % "0.9.1" % "provided",
-    "com.lihaoyi" %% "autowire" % "0.2.3",
-    "com.lihaoyi" %% "upickle" % "0.2.5"
+    "com.typesafe.akka" %% "akka-actor" % "2.3.9",
+    "org.scala-lang.modules" %% "scala-async" % "0.9.3" % "provided",
+    "com.lihaoyi" %% "autowire" % "0.2.4",
+    "com.lihaoyi" %% "upickle" % "0.2.6"
   ),
   resolvers += "bintray/non" at "http://dl.bintray.com/non/maven"
 )
 
-lazy val client = project.in(file("client"))
-                         .settings(defaultSettings ++ scalaJSSettings:_*)
+lazy val client = project.in(file("client")).enablePlugins(ScalaJSPlugin)
+                         .settings(defaultSettings: _*)
                          .settings(
+  unmanagedSourceDirectories in Compile <+= baseDirectory(_ /  ".." / "shared" / "main" / "scala"),
   libraryDependencies ++= Seq(
-    "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6",
-    "com.lihaoyi" %%% "autowire" % "0.2.3",
-    "com.lihaoyi" %%% "upickle" % "0.2.5"
+    "org.scala-js" %%% "scalajs-dom" % "0.8.0",
+    "com.lihaoyi" %%% "autowire" % "0.2.4",
+    "com.lihaoyi" %%% "upickle" % "0.2.6"
   ),
   emitSourceMaps := false
 )