diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-10 20:51:30 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-10 20:51:30 -0800 |
| commit | 2846d28c95d183792d6d809d1c3884b619b6f937 (patch) | |
| tree | 64323ab358a42e718debe6cb5870ac74a8458599 | |
| parent | 916476a310661a0b81011e0af429f356d5cd36e7 (diff) | |
| download | hands-on-scala-js-2846d28c95d183792d6d809d1c3884b619b6f937.tar.gz hands-on-scala-js-2846d28c95d183792d6d809d1c3884b619b6f937.tar.bz2 hands-on-scala-js-2846d28c95d183792d6d809d1c3884b619b6f937.zip | |
Small cleanup, book is now acyclic
4 files changed, 2 insertions, 10 deletions
diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt index 457c5b1..e5b70ff 100644 --- a/examples/crossBuilds/clientserver/build.sbt +++ b/examples/crossBuilds/clientserver/build.sbt @@ -22,8 +22,6 @@ 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", @@ -33,7 +31,6 @@ 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 9c68ece..7c60a91 100644 --- a/examples/crossBuilds/clientserver/project/build.sbt +++ b/examples/crossBuilds/clientserver/project/build.sbt @@ -3,6 +3,3 @@ addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5") 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 83947ac..c9cc526 100644 --- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala +++ b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala @@ -3,9 +3,8 @@ package simple import akka.actor.ActorSystem import spray.http.{HttpEntity, MediaTypes} import spray.routing.SimpleRoutingApp -import upickle._ -object Server extends SimpleRoutingApp{ +object Server extends SimpleRoutingApp{ def main(args: Array[String]): Unit = { implicit val system = ActorSystem() startServer("localhost", port = 8080){ diff --git a/scalatexApi/src/main/scala/scalatex/package.scala b/scalatexApi/src/main/scala/scalatex/package.scala index ca06411..1f13e63 100644 --- a/scalatexApi/src/main/scala/scalatex/package.scala +++ b/scalatexApi/src/main/scala/scalatex/package.scala @@ -7,7 +7,6 @@ import scala.language.experimental.macros import acyclic.file package object scalatex { - /** * Wraps the given string as a twist fragment. */ |