diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-26 23:47:17 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-26 23:47:17 -0800 |
| commit | 3bf82c833b15c2a2e0078b156f5ea48e171a463a (patch) | |
| tree | f9bd6ff3482e9653f4a6c3d42b03355fb971a881 /examples | |
| parent | cc4781d9af3cb57c39a4ac26283f6428ad2aaa60 (diff) | |
| download | hands-on-scala-js-3bf82c833b15c2a2e0078b156f5ea48e171a463a.tar.gz hands-on-scala-js-3bf82c833b15c2a2e0078b156f5ea48e171a463a.tar.bz2 hands-on-scala-js-3bf82c833b15c2a2e0078b156f5ea48e171a463a.zip | |
client-server example works
Diffstat (limited to 'examples')
5 files changed, 9 insertions, 2 deletions
diff --git a/examples/crossBuilds/clientserver/Procfile b/examples/crossBuilds/clientserver/Procfile new file mode 100644 index 0000000..59ff8a8 --- /dev/null +++ b/examples/crossBuilds/clientserver/Procfile @@ -0,0 +1 @@ +web: server/target/universal/stage/bin/server diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt index e5b70ff..3bba3af 100644 --- a/examples/crossBuilds/clientserver/build.sbt +++ b/examples/crossBuilds/clientserver/build.sbt @@ -1,3 +1,4 @@ +import NativePackagerKeys._ import utest.jsrunner.JsCrossBuild import scala.scalajs.sbtplugin.ScalaJSPlugin._ import ScalaJSKeys._ @@ -22,6 +23,7 @@ lazy val client = project.in(file("client")) lazy val server = project.in(file("server")) .settings(sharedSettings:_*) + .settings(packageArchetype.java_application:_*) .settings( libraryDependencies ++= Seq( "io.spray" %% "spray-can" % "1.3.2", diff --git a/examples/crossBuilds/clientserver/project/build.sbt b/examples/crossBuilds/clientserver/project/build.sbt index 7c60a91..c24e2b0 100644 --- a/examples/crossBuilds/clientserver/project/build.sbt +++ b/examples/crossBuilds/clientserver/project/build.sbt @@ -3,3 +3,4 @@ addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5") addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.4") diff --git a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala index ce6617c..d657290 100644 --- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala +++ b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala @@ -10,7 +10,7 @@ object Page{ script(src:="/client-fastopt.js"), link( rel:="stylesheet", - href:="http://yui.yahooapis.com/pure/0.5.0/pure-min.css" + href:="https://cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/pure-min.css" ) ), body( 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 4d1ece2..e9038b5 100644 --- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala +++ b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala @@ -4,10 +4,13 @@ import akka.actor.ActorSystem import spray.http.{HttpEntity, MediaTypes} import spray.routing.SimpleRoutingApp +import scala.util.Properties + object Server extends SimpleRoutingApp{ def main(args: Array[String]): Unit = { implicit val system = ActorSystem() - startServer("localhost", port = 8080){ + val port = Properties.envOrElse("PORT", "8080").toInt + startServer("0.0.0.0", port = port){ get{ pathSingleSlash{ complete{ |