Merge branch 'master' into master

novakov-alexey · web-flow · commit d395fd22bfd4 · 2021-03-12T11:28:58.000+01:00
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ It is published for both scala 2.12 and 2.13.
 
 Add the `org.plotly-scala::plotly-almond:0.8.1` dependency to the notebook. (Latest version: [![Maven Central](https://img.shields.io/maven-central/v/org.plotly-scala/plotly-render_2.13.svg)](https://maven-badges.herokuapp.com/maven-central/org.plotly-scala/plotly-render_2.13))
 Then initialize plotly-scala, and use it, like
+
 ```scala
 import $ivy.`org.plotly-scala::plotly-almond:0.8.1`
 
@@ -48,9 +49,9 @@ Bar(x, y).plot()
 ```
 
 #### JupyterLab
-If you're using [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/), you have to install the [plotly-extension](https://github.com/jupyterlab/jupyter-renderers/tree/master/packages/plotly-extension) to enable support for rendering Plotly charts:
+If you're using [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/), you have to install [jupyterlab-plotly](https://plotly.com/python/getting-started/#jupyterlab-support-python-35) to enable support for rendering Plotly charts:
 ```bash
-jupyter labextension install @jupyterlab/plotly-extension
+jupyter labextension install jupyterlab-plotly
 ```
 
 ### From scala-js
@@ -68,24 +69,20 @@ import plotly._, element._, layout._, Plotly._
 
 Then define plots like
 ```scala
-val x = 0.0 to 10.0 by 0.1
+val x = (0 to 100).map(_ * 0.1)
 val y1 = x.map(d => 2.0 * d + util.Random.nextGaussian())
 val y2 = x.map(math.exp)
 
 val plot = Seq(
-  Scatter(
-    x, y1, name = "Approx twice"
-  ),
-  Scatter(
-    x, y2, name = "Exp"
-  )
+  Scatter(x, y1).withName("Approx twice"),
+  Scatter(x, y2).withName("Exp")
 )
 ```
 and plot them with
+
 ```scala
-plot.plot(
-  title = "Curves"
-)
+val lay = Layout().withTitle("Curves")
+plot.plot("plot", lay)  // attaches to div element with id 'plot'
 ```
 
 
@@ -94,6 +91,7 @@ plot.plot(
 Load the corresponding dependency, and some imports, like
 ```scala
 import $ivy.`org.plotly-scala::plotly-render:0.8.1`
+
 import plotly._, element._, layout._, Plotly._
 ```
 
diff --git a/project/Deps.scala b/project/Deps.scala
@@ -9,14 +9,14 @@ object Deps {
 
   def almondScalaApi = "sh.almond" %% "jupyter-api" % "0.10.9"
   def argonautShapeless = setting("com.github.alexarchambault" %%% "argonaut-shapeless_6.2" % "1.2.0")
-  def dataClass = "io.github.alexarchambault" %% "data-class" % "0.2.3"
-  def jodaTime = "joda-time" % "joda-time" % "2.10.7"
+  def dataClass = "io.github.alexarchambault" %% "data-class" % "0.2.5"
+  def jodaTime = "joda-time" % "joda-time" % "2.10.10"
   def rhino = "org.mozilla" % "rhino" % "1.7.13"
   def shapeless = setting("com.chuusai" %%% "shapeless" % "2.3.3")
   def scalacheckShapeless = setting("com.github.alexarchambault" %%% "scalacheck-shapeless_1.14" % "1.2.0-1")
   def scalajsDom = setting("org.scala-js" %%% "scalajs-dom" % "1.1.0")
-  def scalatags = setting("com.lihaoyi" %%% "scalatags" % "0.9.2")
-  def scalaTest = "org.scalatest" %% "scalatest" % "3.2.2"
+  def scalatags = setting("com.lihaoyi" %%% "scalatags" % "0.9.3")
+  def scalaTest = "org.scalatest" %% "scalatest" % "3.2.4"
   def utest = setting("com.lihaoyi" %%% "utest" % "0.6.6")
 
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.1
+sbt.version=1.4.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
+addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
 addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8")
 addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-eviction-rules" % "0.2.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0")
diff --git a/render/jvm/src/main/scala/plotly/Plotly.scala b/render/jvm/src/main/scala/plotly/Plotly.scala
@@ -144,6 +144,7 @@ object Plotly {
       s"""<!DOCTYPE html>
          |<html>
          |<head>
+         |<meta charset="UTF-8">
          |<title>${layout.title.getOrElse("plotly chart")}</title>
          |$plotlyHeader
          |</head>
