Skip to content

Commit 57c36af

Browse files
committed
Fix typo and remove unused setting
1 parent 2612aca commit 57c36af

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,7 @@ object Build {
15631563
if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") }
15641564
else generateDocumentation(
15651565
roots, "Scala 3", "scala3doc/output/scala3-stdlib", "maser",
1566-
"-siteroot scala3doc/scala3-docs -comment-syntax wiki -projec-logo scala3doc/scala3-docs/logo.svg "
1566+
"-siteroot scala3doc/scala3-docs -comment-syntax wiki -project-logo scala3doc/scala3-docs/logo.svg "
15671567
)
15681568
}.value,
15691569

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ object DottyPlugin extends AutoPlugin {
2020

2121
val useScala3doc = settingKey[Boolean]("Use Scala3doc as the documentation tool")
2222
val tastyFiles = taskKey[Seq[File]]("List all testy files")
23-
val scala3docOptions = settingKey[Seq[String]]("Options for Scala3doc")
2423

2524
// NOTE:
2625
// - this is a def to support `scalaVersion := dottyLatestNightlyBuild`
@@ -361,15 +360,6 @@ object DottyPlugin extends AutoPlugin {
361360
// Configuration for the doctool
362361
resolvers ++= (if(!useScala3doc.value) Nil else Seq(Resolver.jcenterRepo)),
363362
useScala3doc := false,
364-
scala3docOptions := Nil,
365-
Compile / doc / scalacOptions := {
366-
val s3cOpts = (Compile / doc / scalacOptions).value
367-
if (isDotty.value && useScala3doc.value) {
368-
scala3docOptions.value ++ s3cOpts
369-
} else {
370-
s3cOpts
371-
}
372-
},
373363
// We need to add doctool classes to the classpath so they can be called
374364
scalaInstance in doc := Def.taskDyn {
375365
if (isDotty.value)
@@ -447,7 +437,7 @@ object DottyPlugin extends AutoPlugin {
447437
(classDirectory.value ** "*.tasty").get.map(_.getAbsoluteFile)
448438
},
449439
sources ++= Def.taskDyn[Seq[File]] {
450-
if (isDotty.value) Def.task { tastyFiles.value }
440+
if (isDotty.value) Def.task { tastyFiles.value }
451441
else Def.task { Nil }
452442
}.value,
453443
scalacOptions ++= {

0 commit comments

Comments
 (0)