7 files changed, 22 insertions, 26 deletions
diff --git a/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala b/examples/crossBuilds/clientserver2/app/js/src/main/scala/simple/Client.scala
index af3ea91..8894262 100644
--- a/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala
+++ b/examples/crossBuilds/clientserver2/app/js/src/main/scala/simple/Client.scala
@@ -1,13 +1,14 @@
 package simple
 import scalatags.JsDom.all._
 import org.scalajs.dom
+import dom.html
 import scalajs.js.annotation.JSExport
 import scalajs.concurrent.JSExecutionContext.Implicits.runNow
 import autowire._
 
 object Ajaxer extends autowire.Client[String, upickle.Reader, upickle.Writer]{
   override def doCall(req: Request) = {
-    dom.extensions.Ajax.post(
+    dom.ext.Ajax.post(
       url = "/ajax/" + req.path.mkString("/"),
       data = upickle.write(req.args)
     ).map(_.responseText)
diff --git a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver2/app/jvm/src/main/scala/simple/Page.scala
index 9b21b5a..c04107b 100644
--- a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala
+++ b/examples/crossBuilds/clientserver2/app/jvm/src/main/scala/simple/Page.scala
@@ -7,7 +7,7 @@ object Page{
   val skeleton =
     html(
       head(
-        script(src:="/client-fastopt.js"),
+        script(src:="/appjs-fastopt.js"),
         link(
           rel:="stylesheet",
           href:="http://yui.yahooapis.com/pure/0.5.0/pure-min.css"
diff --git a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala b/examples/crossBuilds/clientserver2/app/jvm/src/main/scala/simple/Server.scala
index 8967c17..8967c17 100644
--- a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala
+++ b/examples/crossBuilds/clientserver2/app/jvm/src/main/scala/simple/Server.scala
diff --git a/examples/crossBuilds/clientserver2/client/shared/main/scala/simple/Shared.scala b/examples/crossBuilds/clientserver2/app/shared/src/main/scala/simple/Shared.scala
index c7b17b7..c7b17b7 100644
--- a/examples/crossBuilds/clientserver2/client/shared/main/scala/simple/Shared.scala
+++ b/examples/crossBuilds/clientserver2/app/shared/src/main/scala/simple/Shared.scala
diff --git a/examples/crossBuilds/clientserver2/build.sbt b/examples/crossBuilds/clientserver2/build.sbt
index c5c020c..c01f12b 100644
--- a/examples/crossBuilds/clientserver2/build.sbt
+++ b/examples/crossBuilds/clientserver2/build.sbt
@@ -1,31 +1,27 @@
-val sharedSettings = Seq(
+val app = crossProject.settings(
   unmanagedSourceDirectories in Compile +=
     baseDirectory.value  / "shared" / "main" / "scala",
   libraryDependencies ++= Seq(
-    "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1",
-    "com.lihaoyi" %%% "upickle" % "0.2.6-RC1",
-    "com.lihaoyi" %%% "autowire" % "0.2.4-RC1"
+    "com.lihaoyi" %%% "scalatags" % "0.4.5",
+    "com.lihaoyi" %%% "upickle" % "0.2.6",
+    "com.lihaoyi" %%% "autowire" % "0.2.4"
   ),
   scalaVersion := "2.11.5"
-)
-
-lazy val client = project.in(file("client"))
-                         .enablePlugins(ScalaJSPlugin)
-                         .settings(sharedSettings:_*)
-                         .settings(
-  libraryDependencies ++= Seq(
-    "org.scala-js" %%% "scalajs-dom" % "0.7.0"
+).jsSettings(
+    libraryDependencies ++= Seq(
+      "org.scala-js" %%% "scalajs-dom" % "0.8.0"
+    )
+  ).jvmSettings(
+    libraryDependencies ++= Seq(
+      "io.spray" %% "spray-can" % "1.3.2",
+      "io.spray" %% "spray-routing" % "1.3.2",
+      "com.typesafe.akka" %% "akka-actor" % "2.3.6"
+    )
   )
-)
 
-lazy val server = project.in(file("server"))
-                         .settings(sharedSettings:_*)
-                         .settings(
-  libraryDependencies ++= Seq(
-    "io.spray" %% "spray-can" % "1.3.2",
-    "io.spray" %% "spray-routing" % "1.3.2",
-    "com.typesafe.akka" %% "akka-actor" % "2.3.6"
-  ),
-  (resources in Compile) += (fastOptJS in (client, Compile)).value.data
+lazy val appJS = app.js
+lazy val appJVM = app.jvm.settings(
+  (resources in Compile) += (fastOptJS in (appJS, Compile)).value.data
 )
 
+
diff --git a/examples/crossBuilds/clientserver2/project/build.sbt b/examples/crossBuilds/clientserver2/project/build.sbt
index f969143..d523658 100644
--- a/examples/crossBuilds/clientserver2/project/build.sbt
+++ b/examples/crossBuilds/clientserver2/project/build.sbt
@@ -1,3 +1,3 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")
 
diff --git a/examples/crossBuilds/clientserver2/server/shared b/examples/crossBuilds/clientserver2/server/shared
deleted file mode 120000
index f32be42..0000000
--- a/examples/crossBuilds/clientserver2/server/shared
+++ /dev/null
@@ -1 +0,0 @@
-../client/shared
-\ No newline at end of file