@@ -374,15 +374,13 @@ object Build {
374
374
dottyLib + File .pathSeparator + findArtifactPath(externalDeps, " scala-library" )
375
375
}
376
376
377
- lazy val tastydocSettings = Seq (
377
+ lazy val commonDocSettings = Seq (
378
378
baseDirectory in (Compile , run) := baseDirectory.value / " .." ,
379
379
baseDirectory in Test := baseDirectory.value / " .." ,
380
- libraryDependencies +=
381
- " com.novocode" % " junit-interface" % " 0.11" ,
382
380
libraryDependencies ++= {
383
381
val flexmarkVersion = " 0.42.12"
384
382
Seq (
385
- " com.vladsch.flexmark" % " flexmark-all " % flexmarkVersion,
383
+ " com.vladsch.flexmark" % " flexmark" % flexmarkVersion,
386
384
" com.vladsch.flexmark" % " flexmark-ext-gfm-tasklist" % flexmarkVersion,
387
385
" com.vladsch.flexmark" % " flexmark-ext-gfm-tables" % flexmarkVersion,
388
386
" com.vladsch.flexmark" % " flexmark-ext-autolink" % flexmarkVersion,
@@ -397,9 +395,6 @@ object Build {
397
395
)
398
396
399
397
def dottyDocSettings (implicit mode : Mode ) = Seq (
400
- baseDirectory in (Compile , run) := baseDirectory.value / " .." ,
401
- baseDirectory in Test := baseDirectory.value / " .." ,
402
-
403
398
connectInput in run := true ,
404
399
outputStrategy := Some (StdoutOutput ),
405
400
@@ -434,22 +429,6 @@ object Build {
434
429
435
430
(runMain in Compile ).toTask(s " dotty.tools.dottydoc.Main -classpath $cp " + args.mkString(" " ))
436
431
}.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
- }
453
432
)
454
433
455
434
lazy val `dotty-doc` = project.in(file(" doc-tool" )).asDottyDoc(NonBootstrapped )
@@ -1352,6 +1331,7 @@ object Build {
1352
1331
1353
1332
def asDottyDoc (implicit mode : Mode ): Project = project.withCommonSettings.
1354
1333
dependsOn(dottyCompiler, dottyCompiler % " test->test" ).
1334
+ settings(commonDocSettings).
1355
1335
settings(dottyDocSettings)
1356
1336
1357
1337
def asDottyBench (implicit mode : Mode ): Project = project.withCommonSettings.
@@ -1362,7 +1342,7 @@ object Build {
1362
1342
def asDottyTastydoc (implicit mode : Mode ): Project = project.withCommonSettings.
1363
1343
aggregate(`dotty-tastydoc-input`).
1364
1344
dependsOn(dottyCompiler).
1365
- settings(tastydocSettings )
1345
+ settings(commonDocSettings )
1366
1346
1367
1347
def asDottyTastydocInput (implicit mode : Mode ): Project = project.withCommonSettings.
1368
1348
dependsOn(dottyCompiler)
0 commit comments