Skip to content

Remove unnecessary dependencies from the build #7931

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.

Sign up for GitHub

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 2 commits into from
Jan 9, 2020
Merged

Remove unnecessary dependencies from the build #7931

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b0579
Build.scala: avoid code duplication between dottydoc/tastydoc settings
smarter Jan 8, 2020
921f25a
Build.scala: Remove unnecessary doc dependencies
smarter Jan 8, 2020
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
28 changes: 4 additions & 24 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,15 +374,13 @@ object Build {
dottyLib + File.pathSeparator + findArtifactPath(externalDeps, "scala-library")
}

lazy val tastydocSettings = Seq(
lazy val commonDocSettings = Seq(
baseDirectory in (Compile, run) := baseDirectory.value / "..",
baseDirectory in Test := baseDirectory.value / "..",
libraryDependencies +=
"com.novocode" % "junit-interface" % "0.11",
libraryDependencies ++= {
val flexmarkVersion = "0.42.12"
Seq(
"com.vladsch.flexmark" % "flexmark-all" % flexmarkVersion,
"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,
Expand All @@ -397,9 +395,6 @@ object Build {
)

def dottyDocSettings(implicit mode: Mode) = Seq(
baseDirectory in (Compile, run) := baseDirectory.value / "..",
baseDirectory in Test := baseDirectory.value / "..",

connectInput in run := true,
outputStrategy := Some(StdoutOutput),

Expand Down Expand Up @@ -434,22 +429,6 @@ object Build {

(runMain in Compile).toTask(s" dotty.tools.dottydoc.Main -classpath $cp " + args.mkString(" "))
}.evaluated,

libraryDependencies ++= {
val flexmarkVersion = "0.42.12"
Seq(
"com.vladsch.flexmark" % "flexmark-all" % 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 @@ -1352,6 +1331,7 @@ object Build {

def asDottyDoc(implicit mode: Mode): Project = project.withCommonSettings.
dependsOn(dottyCompiler, dottyCompiler % "test->test").
settings(commonDocSettings).
settings(dottyDocSettings)

def asDottyBench(implicit mode: Mode): Project = project.withCommonSettings.
Expand All @@ -1362,7 +1342,7 @@ object Build {
def asDottyTastydoc(implicit mode: Mode): Project = project.withCommonSettings.
aggregate(`dotty-tastydoc-input`).
dependsOn(dottyCompiler).
settings(tastydocSettings)
settings(commonDocSettings)

def asDottyTastydocInput(implicit mode: Mode): Project = project.withCommonSettings.
dependsOn(dottyCompiler)
Expand Down