diff options
Diffstat (limited to 'examples/crossBuilds')
4 files changed, 12 insertions, 13 deletions
diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt index e162ec4..94525ff 100644 --- a/examples/crossBuilds/clientserver/build.sbt +++ b/examples/crossBuilds/clientserver/build.sbt @@ -3,8 +3,8 @@ val sharedSettings = Seq( unmanagedSourceDirectories in Compile += baseDirectory.value / "shared" / "main" / "scala", libraryDependencies ++= Seq( - "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1", - "com.lihaoyi" %%% "upickle" % "0.2.6-RC1" + "com.lihaoyi" %%% "scalatags" % "0.4.5", + "com.lihaoyi" %%% "upickle" % "0.2.7" ), scalaVersion := "2.11.5" ) @@ -14,7 +14,7 @@ lazy val client = project.in(file("client")) .settings(sharedSettings:_*) .settings( libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.7.0" + "org.scala-js" %%% "scalajs-dom" % "0.8.0" ) ) diff --git a/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala b/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala index 9b3eda1..63e891b 100644 --- a/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala +++ b/examples/crossBuilds/clientserver/client/src/main/scala/simple/Client.scala @@ -9,7 +9,7 @@ import scalajs.js.annotation.JSExport @JSExport object Client extends{ @JSExport - def main(container: dom.HTMLDivElement) = { + def main(container: html.Div) = { val inputBox = input.render val outputBox = ul.render def update() = Ajax.post("/ajax/list", inputBox.value).foreach{ xhr => diff --git a/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala b/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala index 5aefb70..af3ea91 100644 --- a/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala +++ b/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala @@ -20,7 +20,7 @@ object Ajaxer extends autowire.Client[String, upickle.Reader, upickle.Writer]{ @JSExport object Client extends{ @JSExport - def main(container: dom.HTMLDivElement) = { + def main(container: html.Div) = { val inputBox = input.render val outputBox = ul.render def update() = Ajaxer[Api].list(inputBox.value).call().foreach{ data => diff --git a/examples/crossBuilds/simple2/build.sbt b/examples/crossBuilds/simple2/build.sbt index a20cf1d..eb22c41 100644 --- a/examples/crossBuilds/simple2/build.sbt +++ b/examples/crossBuilds/simple2/build.sbt @@ -1,13 +1,12 @@ -import utest.jsrunner.JsCrossBuild -val cross = new JsCrossBuild( +val cross = crossProject.settings( // Shared settings here -) - -lazy val js = cross.js.settings( +).jsSettings( // JS-specific settings here -) - -lazy val jvm = cross.jvm.settings( +).jvmSettings( // JVM-specific settings here ) + +lazy val js = cross.js + +lazy val jvm = cross.jvm |