diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-11-14 01:04:09 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-11-14 01:04:09 -0800 |
| commit | 3a0e2a9d1859227ad2d49e8f248087fd607ed07a (patch) | |
| tree | e69d7374515e44135c446e031d505279b94aa01c | |
| parent | 8b04ff8211ba4d9aee0203748803f19a7148f789 (diff) | |
| download | mavigator-3a0e2a9d1859227ad2d49e8f248087fd607ed07a.tar.gz mavigator-3a0e2a9d1859227ad2d49e8f248087fd607ed07a.tar.bz2 mavigator-3a0e2a9d1859227ad2d49e8f248087fd607ed07a.zip | |
Upgrade dependencies
| -rw-r--r-- | mavigator-cockpit/src/main/scala/mavigator/cockpit/Instruments.scala | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 14 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/mavigator-cockpit/src/main/scala/mavigator/cockpit/Instruments.scala b/mavigator-cockpit/src/main/scala/mavigator/cockpit/Instruments.scala index c8715f4..33bbbcf 100644 --- a/mavigator-cockpit/src/main/scala/mavigator/cockpit/Instruments.scala +++ b/mavigator-cockpit/src/main/scala/mavigator/cockpit/Instruments.scala @@ -48,7 +48,7 @@ trait Instruments { page: Page => /** Retrieves an SVG object element by its instrument's name. */ def svgObject(path: String): html.Object = { val fullPath = page.asset("images/" + path) - `object`(`type` := "image/svg+xml", "data".attr := fullPath, width := 100.pct)( + `object`(`type` := "image/svg+xml", attr("data") := fullPath, width := 100.pct)( "Error loading instrument " + fullPath).render } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index baf4a0f..582fdde 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,21 +6,21 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ object Dependencies { - final val AkkaVersion = "2.4.7" + final val AkkaVersion = "2.4.12" val akkaActor = "com.typesafe.akka" %% "akka-actor" % AkkaVersion - val akkaHttp = "com.typesafe.akka" %% "akka-http-experimental" % AkkaVersion - val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % AkkaVersion + val akkaHttp = "com.typesafe.akka" %% "akka-http-experimental" % "2.4.11" + val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % "2.4.11" val akkaStream = "com.typesafe.akka" %% "akka-stream" % AkkaVersion val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0" - final val FlowVersion = "3.0.1" + final val FlowVersion = "3.0.3" val flow = "ch.jodersky" %% "flow-core" % FlowVersion val flowNative = "ch.jodersky" % "flow-native" % FlowVersion % Runtime val flowStream = "ch.jodersky" %% "flow-stream" % FlowVersion - val jsDom = Def.setting{"org.scala-js" %%% "scalajs-dom" % "0.9.0"} - val scalatags = Def.setting{"com.lihaoyi" %%% "scalatags" % "0.5.4"} - val scalarx = Def.setting{"com.lihaoyi" %%% "scalarx" % "0.3.1"} + val jsDom = Def.setting{"org.scala-js" %%% "scalajs-dom" % "0.9.1"} + val scalatags = Def.setting{"com.lihaoyi" %%% "scalatags" % "0.6.1"} + val scalarx = Def.setting{"com.lihaoyi" %%% "scalarx" % "0.3.2"} } diff --git a/project/build.properties b/project/build.properties index 43b8278..27e88aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.11 +sbt.version=0.13.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index c358264..bde5181 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,7 +9,7 @@ resolvers += Resolver.jcenterRepo */ // add support for scalajs -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") // twirl html templating addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1") |