Skip to content

Upgrade a bunch of dependencies #3855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@ pipeline:
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
test_legacy:
group: test
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- cp -R . /tmp/0/ && cd /tmp/0/
- ./project/scripts/sbt legacyTests

test:
group: test
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- cp -R . /tmp/1/ && cd /tmp/1/
- ./project/scripts/sbt ";compile ;test"
- ./project/scripts/sbtTests

test_bootstrapped:
group: test
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- cp -R . /tmp/2/ && cd /tmp/2/
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
- ./project/scripts/sbtBootstrappedTests

test_optimised:
group: test
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- cp -R . /tmp/3/ && cd /tmp/3/
- ./project/scripts/sbt dotty-optimised/test

test_sbt:
group: test
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- cp -R . /tmp/4/ && cd /tmp/4/
- ./project/scripts/sbt sbt-dotty/scripted
Expand All @@ -56,7 +56,7 @@ pipeline:

# DOCUMENTATION:
documentation:
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
commands:
- ./project/scripts/genDocs
secrets: [ bot_pass ]
Expand All @@ -68,7 +68,7 @@ pipeline:
# PUBLISHING:
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
publish_nightly:
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
environment:
- NIGHTLYBUILD=yes
commands:
Expand All @@ -79,7 +79,7 @@ pipeline:
environment: nightly

publish_release:
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
environment:
- RELEASEBUILD=yes
commands:
Expand All @@ -103,7 +103,7 @@ pipeline:
event: tag

publish_sbt_release:
image: lampepfl/dotty:2018-01-15
image: lampepfl/dotty:2018-01-17
environment:
- RELEASEBUILD=yes
commands:
Expand Down
2 changes: 1 addition & 1 deletion doc-tool/src/dotty/tools/dottydoc/staticsite/Page.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package staticsite
import dotc.util.SourceFile
import com.vladsch.flexmark.html.HtmlRenderer
import com.vladsch.flexmark.parser.Parser
import com.vladsch.flexmark.ext.front.matter.AbstractYamlFrontMatterVisitor
import com.vladsch.flexmark.ext.yaml.front.matter.AbstractYamlFrontMatterVisitor
import java.util.{ Map => JMap, List => JList }
import java.io.{ OutputStreamWriter, BufferedWriter }

Expand Down
2 changes: 1 addition & 1 deletion doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
import com.vladsch.flexmark.ext.emoji.EmojiExtension
import com.vladsch.flexmark.ext.autolink.AutolinkExtension
import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
import com.vladsch.flexmark.ext.front.matter.YamlFrontMatterExtension
import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension
import com.vladsch.flexmark.util.options.{ DataHolder, MutableDataSet }

import dotc.core.Contexts.Context
Expand Down
28 changes: 14 additions & 14 deletions docs/docs/reference/changed/structural-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,20 +113,20 @@ warrant the additional complexity of supporting it.
both select members programmatically. But there are also some
differences.

- Fully dynamic selection is not typesafe, but structural selection
is, as long as the correspondence of the structural type with the
underlying value is as stated.

- `Dynamic` is just a marker trait, which gives more leeway where and
how to define reflective access operations. By contrast
`Selectable` is a trait which declares the access operations.

- One access operation, `selectDynamic` is shared between both
approaches, but the other access operations are
different. `Selectable` defines a `selectDynamicMethod`, which
takes class tags indicating the method's formal parameter types as
additional argument. `Dynamic` comes with `applyDynamic` and
`updateDynamic` methods, which take actual argument values.
- Fully dynamic selection is not typesafe, but structural selection
is, as long as the correspondence of the structural type with the
underlying value is as stated.

- `Dynamic` is just a marker trait, which gives more leeway where and
how to define reflective access operations. By contrast
`Selectable` is a trait which declares the access operations.

- One access operation, `selectDynamic` is shared between both
approaches, but the other access operations are
different. `Selectable` defines a `selectDynamicMethod`, which
takes class tags indicating the method's formal parameter types as
additional argument. `Dynamic` comes with `applyDynamic` and
`updateDynamic` methods, which take actual argument values.

### Reference

Expand Down
31 changes: 17 additions & 14 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -391,18 +391,21 @@ object Build {
(runMain in Compile).toTask(s""" dotty.tools.dottydoc.Main ${cp.mkString(" ")} """ + args.mkString(" "))
}.evaluated,

libraryDependencies ++= Seq(
"com.vladsch.flexmark" % "flexmark" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.11.1",
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.11.1",
Dependencies.`jackson-dataformat-yaml`,
"nl.big-o" % "liqp" % "0.6.7"
)
libraryDependencies ++= {
val flexmarkVersion = "0.28.32"
Seq(
"com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
Dependencies.`jackson-dataformat-yaml`,
"nl.big-o" % "liqp" % "0.6.7"
)
}
)

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

autoScalaLibrary := false,
publishArtifact := false,
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sbt._
* to ensure the same version of the dependency is used in all projects
*/
object Dependencies {
private val jacksonVersion = "2.8.8"
private val jacksonVersion = "2.9.0"
val `jackson-databind` =
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
val `jackson-dataformat-yaml` =
Expand Down
Loading