diff options
Diffstat (limited to 'examples/crossBuilds/clientserver')
-rw-r--r-- | examples/crossBuilds/clientserver/app/js/src/main/scala/simple/Client.scala (renamed from examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala) | 3 | ||||
-rw-r--r-- | examples/crossBuilds/clientserver/app/jvm/src/main/scala/simple/Page.scala (renamed from examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala) | 2 | ||||
-rw-r--r-- | examples/crossBuilds/clientserver/app/jvm/src/main/scala/simple/Server.scala (renamed from examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala) | 0 | ||||
-rw-r--r-- | examples/crossBuilds/clientserver/app/shared/src/main/scala/simple/FileData.scala (renamed from examples/crossBuilds/clientserver/client/shared/main/scala/simple/FileData.scala) | 0 | ||||
-rw-r--r-- | examples/crossBuilds/clientserver/build.sbt | 27 | ||||
-rw-r--r-- | examples/crossBuilds/clientserver/project/build.sbt | 2 | ||||
l--------- | examples/crossBuilds/clientserver/server/shared | 1 |
7 files changed, 15 insertions, 20 deletions
diff --git a/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala b/examples/crossBuilds/clientserver/app/js/src/main/scala/simple/Client.scala index 63e891b..7db2384 100644 --- a/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala +++ b/examples/crossBuilds/clientserver/app/js/src/main/scala/simple/Client.scala @@ -3,7 +3,8 @@ package simple import scalatags.JsDom.all._ import scalajs.concurrent.JSExecutionContext.Implicits.runNow import org.scalajs.dom -import dom.extensions.Ajax +import dom.html +import dom.ext.Ajax import scalajs.js.annotation.JSExport @JSExport diff --git a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver/app/jvm/src/main/scala/simple/Page.scala index 19ed953..27cf954 100644 --- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala +++ b/examples/crossBuilds/clientserver/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:="https://cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/pure-min.css" diff --git a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala b/examples/crossBuilds/clientserver/app/jvm/src/main/scala/simple/Server.scala index e9038b5..e9038b5 100644 --- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Server.scala +++ b/examples/crossBuilds/clientserver/app/jvm/src/main/scala/simple/Server.scala diff --git a/examples/crossBuilds/clientserver/client/shared/main/scala/simple/FileData.scala b/examples/crossBuilds/clientserver/app/shared/src/main/scala/simple/FileData.scala index d3d2f91..d3d2f91 100644 --- a/examples/crossBuilds/clientserver/client/shared/main/scala/simple/FileData.scala +++ b/examples/crossBuilds/clientserver/app/shared/src/main/scala/simple/FileData.scala 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 ) diff --git a/examples/crossBuilds/clientserver/project/build.sbt b/examples/crossBuilds/clientserver/project/build.sbt index 2336450..2e982c3 100644 --- a/examples/crossBuilds/clientserver/project/build.sbt +++ b/examples/crossBuilds/clientserver/project/build.sbt @@ -1,4 +1,4 @@ /*project/build.sbt*/ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.4") diff --git a/examples/crossBuilds/clientserver/server/shared b/examples/crossBuilds/clientserver/server/shared deleted file mode 120000 index f32be42..0000000 --- a/examples/crossBuilds/clientserver/server/shared +++ /dev/null @@ -1 +0,0 @@ -../client/shared
\ No newline at end of file |