Skip to content

Commit 73ce6ba

Browse files
committed
Add default scaladoc settings to scaladoc artifact publishing
1 parent be0844e commit 73ce6ba

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,7 @@ object Build {
843843
"-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
844844
"-Yexplicit-nulls",
845845
),
846+
(Compile / doc / scalacOptions) ++= ScaladocConfigs.DefaultGenerationConfig.value.settings
846847
)
847848

848849
lazy val `scala3-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
@@ -1893,7 +1894,6 @@ object ScaladocConfigs {
18931894
}
18941895

18951896
lazy val DefaultGenerationConfig = Def.task {
1896-
def distLocation = (dist / pack).value
18971897
def projectVersion = version.value
18981898
def socialLinks = SocialLinks(List(
18991899
"github::https://github.com/lampepfl/dotty",

project/ScaladocGeneration.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ object ScaladocGeneration {
141141
def remove[T <: Arg[_]: ClassTag]: GenerationConfig
142142
def withTargets(targets: Seq[String]): GenerationConfig
143143
def serialize: String
144+
def settings: Seq[String]
144145
}
145146

146147
object GenerationConfig {
@@ -173,6 +174,9 @@ object ScaladocGeneration {
173174
++ targets
174175
).mkString(" ")
175176

177+
override def settings: Seq[String] =
178+
args.map(_.serialize) ++ targets
179+
176180
private def argsWithout[T <: Arg[_]](
177181
implicit tag: ClassTag[T]
178182
): (Option[T], Seq[Arg[_]]) = args.foldLeft[(Option[T], Seq[Arg[_]])]((None, Seq.empty)) {

0 commit comments

Comments
 (0)