Skip to content

Commit a360b66

Browse files
Merge pull request #7931 from dotty-staging/fix-doc-deps
Remove unnecessary dependencies from the build
2 parents dc41bc9 + 921f25a commit a360b66

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

project/Build.scala

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -374,15 +374,13 @@ object Build {
374374
dottyLib + File.pathSeparator + findArtifactPath(externalDeps, "scala-library")
375375
}
376376

377-
lazy val tastydocSettings = Seq(
377+
lazy val commonDocSettings = Seq(
378378
baseDirectory in (Compile, run) := baseDirectory.value / "..",
379379
baseDirectory in Test := baseDirectory.value / "..",
380-
libraryDependencies +=
381-
"com.novocode" % "junit-interface" % "0.11",
382380
libraryDependencies ++= {
383381
val flexmarkVersion = "0.42.12"
384382
Seq(
385-
"com.vladsch.flexmark" % "flexmark-all" % flexmarkVersion,
383+
"com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
386384
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
387385
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
388386
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
@@ -397,9 +395,6 @@ object Build {
397395
)
398396

399397
def dottyDocSettings(implicit mode: Mode) = Seq(
400-
baseDirectory in (Compile, run) := baseDirectory.value / "..",
401-
baseDirectory in Test := baseDirectory.value / "..",
402-
403398
connectInput in run := true,
404399
outputStrategy := Some(StdoutOutput),
405400

@@ -434,22 +429,6 @@ object Build {
434429

435430
(runMain in Compile).toTask(s" dotty.tools.dottydoc.Main -classpath $cp " + args.mkString(" "))
436431
}.evaluated,
437-
438-
libraryDependencies ++= {
439-
val flexmarkVersion = "0.42.12"
440-
Seq(
441-
"com.vladsch.flexmark" % "flexmark-all" % flexmarkVersion,
442-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
443-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
444-
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
445-
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
446-
"com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
447-
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
448-
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
449-
Dependencies.`jackson-dataformat-yaml`,
450-
"nl.big-o" % "liqp" % "0.6.7"
451-
)
452-
}
453432
)
454433

455434
lazy val `dotty-doc` = project.in(file("doc-tool")).asDottyDoc(NonBootstrapped)
@@ -1352,6 +1331,7 @@ object Build {
13521331

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

13571337
def asDottyBench(implicit mode: Mode): Project = project.withCommonSettings.
@@ -1362,7 +1342,7 @@ object Build {
13621342
def asDottyTastydoc(implicit mode: Mode): Project = project.withCommonSettings.
13631343
aggregate(`dotty-tastydoc-input`).
13641344
dependsOn(dottyCompiler).
1365-
settings(tastydocSettings)
1345+
settings(commonDocSettings)
13661346

13671347
def asDottyTastydocInput(implicit mode: Mode): Project = project.withCommonSettings.
13681348
dependsOn(dottyCompiler)

0 commit comments

Comments
 (0)