Skip to content

Commit 2949456

Browse files
committed
Disabled publishing of scaladoc in dotty build, this allows us to publish for Dotty for now.
1 parent 2335154 commit 2949456

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

project/scalatest.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ object ScalatestBuild {
601601
.settings(
602602
projectTitle := "Scalactic",
603603
organization := "org.scalactic",
604+
moduleName := "scalactic",
604605
initialCommands in console := "import org.scalactic._",
605606
sourceGenerators in Compile += {
606607
Def.task{
@@ -622,12 +623,9 @@ object ScalatestBuild {
622623
GenScalacticDotty.genResource((resourceManaged in Compile).value)
623624
}.taskValue
624625
},
625-
// include the macro classes and resources in the main jar
626-
mappings in (Compile, packageBin) ++= mappings.in(scalacticMacro, Compile, packageBin).value,
627-
// include the macro sources in the main source jar
628-
mappings in (Compile, packageSrc) ++= mappings.in(scalacticMacro, Compile, packageSrc).value,
629-
scalacticDocSourcesSetting,
630-
docTaskSetting,
626+
//scalacticDocSourcesSetting,
627+
//docTaskSetting,
628+
publishArtifact in (Compile, packageDoc) := false, // Temporary disable publishing of doc, can't get it to build.
631629
mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
632630
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
633631
).settings(osgiSettings: _*).settings(
@@ -983,7 +981,8 @@ object ScalatestBuild {
983981
//GenSafeStyles.genMain((sourceManaged in Compile).value / "org" / "scalatest", version.value, scalaVersion.value)
984982
}.taskValue
985983
},
986-
scalatestJSDocTaskSetting,
984+
//scalatestJSDocTaskSetting,
985+
publishArtifact in (Compile, packageDoc) := false, // Temporary disable publishing of doc, can't get it to build.
987986
mimaPreviousArtifacts := Set(organization.value %% name.value % previousReleaseVersion),
988987
mimaCurrentClassfiles := (classDirectory in Compile).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar"),
989988
mimaBinaryIssueFilters ++= {

0 commit comments

Comments
 (0)