From 916476a310661a0b81011e0af429f356d5cd36e7 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi@dropbox.com>
Date: Mon, 10 Nov 2014 20:49:32 -0800
Subject: Small cleanup, book is now acyclic

---
 examples/crossBuilds/clientserver/build.sbt                      | 9 +++++++--
 examples/crossBuilds/clientserver/project/build.sbt              | 6 +++++-
 .../clientserver/server/src/main/scala/simple/Server.scala       | 2 +-
 examples/demos/build.sbt                                         | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt
index 618ac8a..457c5b1 100644
--- a/examples/crossBuilds/clientserver/build.sbt
+++ b/examples/crossBuilds/clientserver/build.sbt
@@ -7,7 +7,8 @@ val sharedSettings = Seq(
   libraryDependencies ++= Seq(
     "com.scalatags" %%% "scalatags" % "0.4.2",
     "com.lihaoyi" %%% "upickle" % "0.2.5"
-  )
+  ),
+  scalaVersion := "2.11.4"
 )
 
 lazy val client = project.in(file("client"))
@@ -21,6 +22,8 @@ lazy val client = project.in(file("client"))
 
 lazy val server = project.in(file("server"))
                          .settings(sharedSettings:_*)
+                         .settings(com.lihaoyi.workbench.Plugin.workbenchSettings:_*)
+                         .settings(spray.revolver.RevolverPlugin.Revolver.settings:_*)
                          .settings(
   libraryDependencies ++= Seq(
     "io.spray" %% "spray-can" % "1.3.2",
@@ -30,5 +33,7 @@ lazy val server = project.in(file("server"))
   (resources in Compile) += {
     (fastOptJS in (client, Compile)).value
     (artifactPath in (client, Compile, fastOptJS)).value
-  }
+  },
+    bootSnippet := "",
 )
+
diff --git a/examples/crossBuilds/clientserver/project/build.sbt b/examples/crossBuilds/clientserver/project/build.sbt
index 5bd83ce..9c68ece 100644
--- a/examples/crossBuilds/clientserver/project/build.sbt
+++ b/examples/crossBuilds/clientserver/project/build.sbt
@@ -1,4 +1,8 @@
 /*project/build.sbt*/
 addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5")
 
-addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4")
\ No newline at end of file
+addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4")
+
+addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.3")
+
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
diff --git a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala
index 6b2fea3..83947ac 100644
--- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala
+++ b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala
@@ -3,7 +3,7 @@ package simple
 import akka.actor.ActorSystem
 import spray.http.{HttpEntity, MediaTypes}
 import spray.routing.SimpleRoutingApp
-
+import upickle._
 object Server extends SimpleRoutingApp{
 
   def main(args: Array[String]): Unit = {
diff --git a/examples/demos/build.sbt b/examples/demos/build.sbt
index 7e6b685..20b9fca 100644
--- a/examples/demos/build.sbt
+++ b/examples/demos/build.sbt
@@ -4,7 +4,7 @@ name := "Example"
 
 version := "0.1-SNAPSHOT"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.4"
 
 libraryDependencies += "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6"
 
-- 
cgit v1.2.3