Skip to content

Commit 16d0499

Browse files
committed
Upgrade dottydoc dependencies
Except liqp, because 0.7.2 causes a crash when running `sbt genDocs` The new flexmark required a change in structural-types.md to properly render the indented list, everything else seems to be rendered the same.
1 parent 18847b3 commit 16d0499

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package staticsite
66
import dotc.util.SourceFile
77
import com.vladsch.flexmark.html.HtmlRenderer
88
import com.vladsch.flexmark.parser.Parser
9-
import com.vladsch.flexmark.ext.front.matter.AbstractYamlFrontMatterVisitor
9+
import com.vladsch.flexmark.ext.yaml.front.matter.AbstractYamlFrontMatterVisitor
1010
import java.util.{ Map => JMap, List => JList }
1111
import java.io.{ OutputStreamWriter, BufferedWriter }
1212

doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
1717
import com.vladsch.flexmark.ext.emoji.EmojiExtension
1818
import com.vladsch.flexmark.ext.autolink.AutolinkExtension
1919
import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
20-
import com.vladsch.flexmark.ext.front.matter.YamlFrontMatterExtension
20+
import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension
2121
import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }
2222

2323
import dotc.core.Contexts.Context

docs/docs/reference/changed/structural-types.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,20 @@ warrant the additional complexity of supporting it.
113113
both select members programmatically. But there are also some
114114
differences.
115115

116-
- Fully dynamic selection is not typesafe, but structural selection
117-
is, as long as the correspondence of the structural type with the
118-
underlying value is as stated.
119-
120-
- `Dynamic` is just a marker trait, which gives more leeway where and
121-
how to define reflective access operations. By contrast
122-
`Selectable` is a trait which declares the access operations.
123-
124-
- One access operation, `selectDynamic` is shared between both
125-
approaches, but the other access operations are
126-
different. `Selectable` defines a `selectDynamicMethod`, which
127-
takes class tags indicating the method's formal parameter types as
128-
additional argument. `Dynamic` comes with `applyDynamic` and
129-
`updateDynamic` methods, which take actual argument values.
116+
- Fully dynamic selection is not typesafe, but structural selection
117+
is, as long as the correspondence of the structural type with the
118+
underlying value is as stated.
119+
120+
- `Dynamic` is just a marker trait, which gives more leeway where and
121+
how to define reflective access operations. By contrast
122+
`Selectable` is a trait which declares the access operations.
123+
124+
- One access operation, `selectDynamic` is shared between both
125+
approaches, but the other access operations are
126+
different. `Selectable` defines a `selectDynamicMethod`, which
127+
takes class tags indicating the method's formal parameter types as
128+
additional argument. `Dynamic` comes with `applyDynamic` and
129+
`updateDynamic` methods, which take actual argument values.
130130

131131
### Reference
132132

project/Build.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,14 +392,14 @@ object Build {
392392
}.evaluated,
393393

394394
libraryDependencies ++= Seq(
395-
"com.vladsch.flexmark" % "flexmark" % "0.11.1",
396-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.11.1",
397-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.11.1",
398-
"com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.11.1",
399-
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.11.1",
400-
"com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.11.1",
401-
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.11.1",
402-
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.11.1",
395+
"com.vladsch.flexmark" % "flexmark" % "0.28.32",
396+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.28.32",
397+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.28.32",
398+
"com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.28.32",
399+
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.28.32",
400+
"com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.28.32",
401+
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.28.32",
402+
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.28.32",
403403
Dependencies.`jackson-dataformat-yaml`,
404404
"nl.big-o" % "liqp" % "0.6.7"
405405
)

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sbt._
44
* to ensure the same version of the dependency is used in all projects
55
*/
66
object Dependencies {
7-
private val jacksonVersion = "2.8.8"
7+
private val jacksonVersion = "2.9.0"
88
val `jackson-databind` =
99
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
1010
val `jackson-dataformat-yaml` =

0 commit comments

Comments
 (0)