Skip to content

Commit d7f6636

Browse files
authored
Merge pull request #3855 from dotty-staging/upgrade-deps
Upgrade a bunch of dependencies
2 parents 8807f4f + 7085e7d commit d7f6636

File tree

8 files changed

+440
-410
lines changed

8 files changed

+440
-410
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@ pipeline:
1616
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
1717
test_legacy:
1818
group: test
19-
image: lampepfl/dotty:2018-01-15
19+
image: lampepfl/dotty:2018-01-17
2020
commands:
2121
- cp -R . /tmp/0/ && cd /tmp/0/
2222
- ./project/scripts/sbt legacyTests
2323

2424
test:
2525
group: test
26-
image: lampepfl/dotty:2018-01-15
26+
image: lampepfl/dotty:2018-01-17
2727
commands:
2828
- cp -R . /tmp/1/ && cd /tmp/1/
2929
- ./project/scripts/sbt ";compile ;test"
3030
- ./project/scripts/sbtTests
3131

3232
test_bootstrapped:
3333
group: test
34-
image: lampepfl/dotty:2018-01-15
34+
image: lampepfl/dotty:2018-01-17
3535
commands:
3636
- cp -R . /tmp/2/ && cd /tmp/2/
3737
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
3838
- ./project/scripts/sbtBootstrappedTests
3939

4040
test_optimised:
4141
group: test
42-
image: lampepfl/dotty:2018-01-15
42+
image: lampepfl/dotty:2018-01-17
4343
commands:
4444
- cp -R . /tmp/3/ && cd /tmp/3/
4545
- ./project/scripts/sbt dotty-optimised/test
4646

4747
test_sbt:
4848
group: test
49-
image: lampepfl/dotty:2018-01-15
49+
image: lampepfl/dotty:2018-01-17
5050
commands:
5151
- cp -R . /tmp/4/ && cd /tmp/4/
5252
- ./project/scripts/sbt sbt-dotty/scripted
@@ -56,7 +56,7 @@ pipeline:
5656

5757
# DOCUMENTATION:
5858
documentation:
59-
image: lampepfl/dotty:2018-01-15
59+
image: lampepfl/dotty:2018-01-17
6060
commands:
6161
- ./project/scripts/genDocs
6262
secrets: [ bot_pass ]
@@ -68,7 +68,7 @@ pipeline:
6868
# PUBLISHING:
6969
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
7070
publish_nightly:
71-
image: lampepfl/dotty:2018-01-15
71+
image: lampepfl/dotty:2018-01-17
7272
environment:
7373
- NIGHTLYBUILD=yes
7474
commands:
@@ -79,7 +79,7 @@ pipeline:
7979
environment: nightly
8080

8181
publish_release:
82-
image: lampepfl/dotty:2018-01-15
82+
image: lampepfl/dotty:2018-01-17
8383
environment:
8484
- RELEASEBUILD=yes
8585
commands:
@@ -103,7 +103,7 @@ pipeline:
103103
event: tag
104104

105105
publish_sbt_release:
106-
image: lampepfl/dotty:2018-01-15
106+
image: lampepfl/dotty:2018-01-17
107107
environment:
108108
- RELEASEBUILD=yes
109109
commands:

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: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -391,18 +391,21 @@ object Build {
391391
(runMain in Compile).toTask(s""" dotty.tools.dottydoc.Main ${cp.mkString(" ")} """ + args.mkString(" "))
392392
}.evaluated,
393393

394-
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",
403-
Dependencies.`jackson-dataformat-yaml`,
404-
"nl.big-o" % "liqp" % "0.6.7"
405-
)
394+
libraryDependencies ++= {
395+
val flexmarkVersion = "0.28.32"
396+
Seq(
397+
"com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
398+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
399+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
400+
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
401+
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
402+
"com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
403+
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
404+
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
405+
Dependencies.`jackson-dataformat-yaml`,
406+
"nl.big-o" % "liqp" % "0.6.7"
407+
)
408+
}
406409
)
407410

408411
lazy val `dotty-doc` = project.in(file("doc-tool")).asDottyDoc(NonBootstrapped)
@@ -772,7 +775,7 @@ object Build {
772775
// (you need to have `cancelable in Global := true` in your global sbt config to ctrl+c a run)
773776
fork in run := true,
774777
libraryDependencies ++= Seq(
775-
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.2.0",
778+
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.3.0",
776779
Dependencies.`jackson-databind`
777780
),
778781
javaOptions := (javaOptions in `dotty-compiler-bootstrapped`).value,
@@ -902,7 +905,7 @@ object Build {
902905
settings(commonSettings).
903906
settings(
904907
EclipseKeys.skipProject := true,
905-
version := "0.1.2", // Keep in sync with package.json
908+
version := "0.1.3", // Keep in sync with package.json
906909

907910
autoScalaLibrary := false,
908911
publishArtifact := false,

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)