diff options
Diffstat (limited to 'examples/crossBuilds')
5 files changed, 8 insertions, 5 deletions
diff --git a/examples/crossBuilds/clientserver2/build.sbt b/examples/crossBuilds/clientserver2/build.sbt index c64a6fd..4c5045f 100644 --- a/examples/crossBuilds/clientserver2/build.sbt +++ b/examples/crossBuilds/clientserver2/build.sbt @@ -1,5 +1,5 @@ import utest.jsrunner.JsCrossBuild -import scala.scalajs.sbtplugin.ScalaJSPlugin._ +import scalajs.sbtplugin.ScalaJSPlugin._ import ScalaJSKeys._ val sharedSettings = Seq( unmanagedSourceDirectories in Compile += 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 026e52d..5aefb70 100644 --- a/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala +++ b/examples/crossBuilds/clientserver2/client/src/main/scala/simple/Client.scala @@ -1,7 +1,7 @@ package simple import scalatags.JsDom.all._ import org.scalajs.dom -import scala.scalajs.js.annotation.JSExport +import scalajs.js.annotation.JSExport import scalajs.concurrent.JSExecutionContext.Implicits.runNow import autowire._ diff --git a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala index df5f877..8967c17 100644 --- a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala +++ b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Server.scala @@ -30,7 +30,10 @@ object Server extends SimpleRoutingApp with Api{ extract(_.request.entity.asString) { e => complete { Router.route[Api](Server)( - autowire.Core.Request(s, upickle.read[Map[String, String]](e)) + autowire.Core.Request( + s, + upickle.read[Map[String, String]](e) + ) ) } } diff --git a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala index 35ebe1d..d726ec1 100644 --- a/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple/js/src/main/scala/simple/Platform.scala @@ -1,6 +1,6 @@ //js/src/main/scala/simple/Platform.scala package simple -import scala.scalajs.js +import scalajs.js object Platform extends js.JSApp{ def format(ts: Long) = { diff --git a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala index 42cc7dc..d4a9554 100644 --- a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala +++ b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala @@ -1,6 +1,6 @@ //js/src/main/scala/simple/Platform.scala package simple -import scala.scalajs.js +import scalajs.js object Platform{ def format(ts: Long) = { |