1 files changed, 11 insertions, 16 deletions
diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt
index 94525ff..85c51fa 100644
--- a/examples/crossBuilds/clientserver/build.sbt
+++ b/examples/crossBuilds/clientserver/build.sbt
@@ -1,32 +1,27 @@
 import NativePackagerKeys._
-val sharedSettings = Seq(
+
+val app = crossProject.settings(
   unmanagedSourceDirectories in Compile +=
     baseDirectory.value  / "shared" / "main" / "scala",
   libraryDependencies ++= Seq(
     "com.lihaoyi" %%% "scalatags" % "0.4.5",
-    "com.lihaoyi" %%% "upickle" % "0.2.7"
+    "com.lihaoyi" %%% "upickle" % "0.2.6"
   ),
   scalaVersion := "2.11.5"
-)
-
-lazy val client = project.in(file("client"))
-                         .enablePlugins(ScalaJSPlugin)
-                         .settings(sharedSettings:_*)
-                         .settings(
+).jsSettings(
   libraryDependencies ++= Seq(
     "org.scala-js" %%% "scalajs-dom" % "0.8.0"
   )
-)
-
-lazy val server = project.in(file("server"))
-                         .settings(sharedSettings:_*)
-                         .settings(packageArchetype.java_application:_*)
-                         .settings(
+).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"
-  ),
-  (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
 )