diff options
Diffstat (limited to 'examples/crossBuilds/clientserver2')
4 files changed, 10 insertions, 17 deletions
diff --git a/examples/crossBuilds/clientserver2/build.sbt b/examples/crossBuilds/clientserver2/build.sbt index 4c5045f..c5c020c 100644 --- a/examples/crossBuilds/clientserver2/build.sbt +++ b/examples/crossBuilds/clientserver2/build.sbt @@ -1,23 +1,20 @@ -import utest.jsrunner.JsCrossBuild -import scalajs.sbtplugin.ScalaJSPlugin._ -import ScalaJSKeys._ val sharedSettings = Seq( unmanagedSourceDirectories in Compile += baseDirectory.value / "shared" / "main" / "scala", libraryDependencies ++= Seq( - "com.scalatags" %%% "scalatags" % "0.4.2", - "com.lihaoyi" %%% "upickle" % "0.2.5", - "com.lihaoyi" %%% "autowire" % "0.2.3" + "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1", + "com.lihaoyi" %%% "upickle" % "0.2.6-RC1", + "com.lihaoyi" %%% "autowire" % "0.2.4-RC1" ), - scalaVersion := "2.11.4" + scalaVersion := "2.11.5" ) lazy val client = project.in(file("client")) - .settings(scalaJSSettings:_*) + .enablePlugins(ScalaJSPlugin) .settings(sharedSettings:_*) .settings( libraryDependencies ++= Seq( - "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6" + "org.scala-js" %%% "scalajs-dom" % "0.7.0" ) ) @@ -29,9 +26,6 @@ lazy val server = project.in(file("server")) "io.spray" %% "spray-routing" % "1.3.2", "com.typesafe.akka" %% "akka-actor" % "2.3.6" ), - (resources in Compile) += { - (fastOptJS in (client, Compile)).value - (artifactPath in (client, Compile, fastOptJS)).value - } + (resources in Compile) += (fastOptJS in (client, Compile)).value.data ) diff --git a/examples/crossBuilds/clientserver2/project/build.properties b/examples/crossBuilds/clientserver2/project/build.properties new file mode 100644 index 0000000..748703f --- /dev/null +++ b/examples/crossBuilds/clientserver2/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.7 diff --git a/examples/crossBuilds/clientserver2/project/build.sbt b/examples/crossBuilds/clientserver2/project/build.sbt index 7c60a91..f969143 100644 --- a/examples/crossBuilds/clientserver2/project/build.sbt +++ b/examples/crossBuilds/clientserver2/project/build.sbt @@ -1,5 +1,3 @@ /*project/build.sbt*/ -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5") - -addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2") diff --git a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala index ce6617c..9b21b5a 100644 --- a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala +++ b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala @@ -3,7 +3,7 @@ import scalatags.Text.all._ object Page{ val boot = - "Client().main(document.getElementById('contents'))" + "simple.Client().main(document.getElementById('contents'))" val skeleton = html( head( |