Merge pull request #19 from sjrd/scalajs-0.6

Upgrade and update the whole thing for Scala.js 0.6.0-RC2.

1 files changed, 7 insertions, 13 deletions

diff --git a/examples/crossBuilds/clientserver2/build.sbt b/examples/crossBuilds/clientserver2/build.sbt
index 4c5045f..c5c020c 100644
--- a/examples/crossBuilds/clientserver2/build.sbt
+++ b/examples/crossBuilds/clientserver2/build.sbt
@@ -1,23 +1,20 @@
-import utest.jsrunner.JsCrossBuild
-import scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
 val sharedSettings = Seq(
   unmanagedSourceDirectories in Compile +=
     baseDirectory.value  / "shared" / "main" / "scala",
   libraryDependencies ++= Seq(
-    "com.scalatags" %%% "scalatags" % "0.4.2",
-    "com.lihaoyi" %%% "upickle" % "0.2.5",
-    "com.lihaoyi" %%% "autowire" % "0.2.3"
+    "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1",
+    "com.lihaoyi" %%% "upickle" % "0.2.6-RC1",
+    "com.lihaoyi" %%% "autowire" % "0.2.4-RC1"
   ),
-  scalaVersion := "2.11.4"
+  scalaVersion := "2.11.5"
 )
 
 lazy val client = project.in(file("client"))
-                         .settings(scalaJSSettings:_*)
+                         .enablePlugins(ScalaJSPlugin)
                          .settings(sharedSettings:_*)
                          .settings(
   libraryDependencies ++= Seq(
-    "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6"
+    "org.scala-js" %%% "scalajs-dom" % "0.7.0"
   )
 )
 
@@ -29,9 +26,6 @@ lazy val server = project.in(file("server"))
     "io.spray" %% "spray-routing" % "1.3.2",
     "com.typesafe.akka" %% "akka-actor" % "2.3.6"
   ),
-  (resources in Compile) += {
-    (fastOptJS in (client, Compile)).value
-    (artifactPath in (client, Compile, fastOptJS)).value
-  }
+  (resources in Compile) += (fastOptJS in (client, Compile)).value.data
 )