Skip to content

Commit 0dca538

Browse files
committed
Fixed scaladoc build problem in jvm, js and native.
1 parent 530019b commit 0dca538

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ To publish scalactic, scalatest and scalatest-app use the following command:
168168
$ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
169169
$ export SCALAJS_VERSION=1.0.0-M8
170170
$ sbt ++2.13.0 "project scalatestAppJS" clean publishSigned
171+
$ sbt scalacticDotty/clean scalacticDotty/publishSigned
172+
$ sbt scalatestDotty/clean scalatestDotty/publishSigned
171173

172174
To publish scalatest modules for jvm, use the following commands:
173175

project/BuildCommons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trait BuildCommons {
77

88
lazy val supportedScalaVersions = List("2.13.0", "2.12.9", "2.11.12", "2.10.7")
99

10-
val releaseVersion = "3.1.0-M2"
10+
val releaseVersion = "3.1.0-RC1"
1111

1212
val previousReleaseVersion = "3.0.8"
1313

project/JsBuild.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ trait JsBuild { this: BuildCommons =>
514514
"Bundle-DocURL" -> "http://www.scalatest.org/",
515515
"Bundle-Vendor" -> "Artima, Inc."
516516
)
517-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
517+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
518518

519519
lazy val scalatestFlatSpecJS = Project("scalatestFlatSpecJS", file("modules/js/scalatest-flatspec.js"))
520520
.enablePlugins(SbtOsgi)
@@ -546,7 +546,7 @@ trait JsBuild { this: BuildCommons =>
546546
"Bundle-DocURL" -> "http://www.scalatest.org/",
547547
"Bundle-Vendor" -> "Artima, Inc."
548548
)
549-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
549+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
550550

551551
lazy val scalatestFreeSpecJS = Project("scalatestFreeSpecJS", file("modules/js/scalatest-freespec.js"))
552552
.enablePlugins(SbtOsgi)
@@ -578,7 +578,7 @@ trait JsBuild { this: BuildCommons =>
578578
"Bundle-DocURL" -> "http://www.scalatest.org/",
579579
"Bundle-Vendor" -> "Artima, Inc."
580580
)
581-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
581+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
582582

583583
lazy val scalatestFunSuiteJS = Project("scalatestFunSuiteJS", file("modules/js/scalatest-funsuite.js"))
584584
.enablePlugins(SbtOsgi)
@@ -610,7 +610,7 @@ trait JsBuild { this: BuildCommons =>
610610
"Bundle-DocURL" -> "http://www.scalatest.org/",
611611
"Bundle-Vendor" -> "Artima, Inc."
612612
)
613-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
613+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
614614

615615
lazy val scalatestFunSpecJS = Project("scalatestFunSpecJS", file("modules/js/scalatest-funspec.js"))
616616
.enablePlugins(SbtOsgi)
@@ -674,7 +674,7 @@ trait JsBuild { this: BuildCommons =>
674674
"Bundle-DocURL" -> "http://www.scalatest.org/",
675675
"Bundle-Vendor" -> "Artima, Inc."
676676
)
677-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
677+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
678678

679679
lazy val scalatestWordSpecJS = Project("scalatestWordSpecJS", file("modules/js/scalatest-wordspec.js"))
680680
.enablePlugins(SbtOsgi)
@@ -706,7 +706,7 @@ trait JsBuild { this: BuildCommons =>
706706
"Bundle-DocURL" -> "http://www.scalatest.org/",
707707
"Bundle-Vendor" -> "Artima, Inc."
708708
)
709-
).dependsOn(scalatestCoreJS).enablePlugins(ScalaJSPlugin)
709+
).dependsOn(scalatestCoreJS, scalacticMacroJS % "compile-internal, test-internal").enablePlugins(ScalaJSPlugin)
710710

711711
lazy val scalatestDiagramsJS = Project("scalatestDiagramsJS", file("modules/js/scalatest-diagrams.js"))
712712
.enablePlugins(SbtOsgi)

project/NativeBuild.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ trait NativeBuild { this: BuildCommons =>
363363
"Bundle-DocURL" -> "http://www.scalatest.org/",
364364
"Bundle-Vendor" -> "Artima, Inc."
365365
)
366-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
366+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
367367

368368
lazy val scalatestFlatSpecNative = Project("scalatestFlatSpecNative", file("modules/native/scalatest-flatspec.native"))
369369
.enablePlugins(SbtOsgi)
@@ -392,7 +392,7 @@ trait NativeBuild { this: BuildCommons =>
392392
"Bundle-DocURL" -> "http://www.scalatest.org/",
393393
"Bundle-Vendor" -> "Artima, Inc."
394394
)
395-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
395+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
396396

397397
lazy val scalatestFreeSpecNative = Project("scalatestFreeSpecNative", file("modules/native/scalatest-freespec.native"))
398398
.enablePlugins(SbtOsgi)
@@ -421,7 +421,7 @@ trait NativeBuild { this: BuildCommons =>
421421
"Bundle-DocURL" -> "http://www.scalatest.org/",
422422
"Bundle-Vendor" -> "Artima, Inc."
423423
)
424-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
424+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
425425

426426
lazy val scalatestFunSuiteNative = Project("scalatestFunSuiteNative", file("modules/native/scalatest-funsuite.native"))
427427
.enablePlugins(SbtOsgi)
@@ -450,7 +450,7 @@ trait NativeBuild { this: BuildCommons =>
450450
"Bundle-DocURL" -> "http://www.scalatest.org/",
451451
"Bundle-Vendor" -> "Artima, Inc."
452452
)
453-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
453+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
454454

455455
lazy val scalatestFunSpecNative = Project("scalatestFunSpecNative", file("modules/native/scalatest-funspec.native"))
456456
.enablePlugins(SbtOsgi)
@@ -508,7 +508,7 @@ trait NativeBuild { this: BuildCommons =>
508508
"Bundle-DocURL" -> "http://www.scalatest.org/",
509509
"Bundle-Vendor" -> "Artima, Inc."
510510
)
511-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
511+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
512512

513513
lazy val scalatestWordSpecNative = Project("scalatestWordSpecNative", file("modules/native/scalatest-wordspec.native"))
514514
.enablePlugins(SbtOsgi)
@@ -537,7 +537,7 @@ trait NativeBuild { this: BuildCommons =>
537537
"Bundle-DocURL" -> "http://www.scalatest.org/",
538538
"Bundle-Vendor" -> "Artima, Inc."
539539
)
540-
).dependsOn(scalatestCoreNative).enablePlugins(ScalaNativePlugin)
540+
).dependsOn(scalatestCoreNative, scalacticMacroNative % "compile-internal, test-internal").enablePlugins(ScalaNativePlugin)
541541

542542
lazy val scalatestDiagramsNative = Project("scalatestDiagramsNative", file("modules/native/scalatest-diagrams.native"))
543543
.enablePlugins(SbtOsgi)

project/scalatest.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
692692
"Bundle-DocURL" -> "http://www.scalatest.org/",
693693
"Bundle-Vendor" -> "Artima, Inc."
694694
)
695-
).dependsOn(scalatestCore)
695+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
696696

697697
lazy val scalatestFlatSpec = Project("scalatestFlatSpec", file("modules/jvm/scalatest-flatspec"))
698698
.enablePlugins(SbtOsgi)
@@ -731,7 +731,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
731731
"Bundle-DocURL" -> "http://www.scalatest.org/",
732732
"Bundle-Vendor" -> "Artima, Inc."
733733
)
734-
).dependsOn(scalatestCore)
734+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
735735

736736
lazy val scalatestFreeSpec = Project("scalatestFreeSpec", file("modules/jvm/scalatest-freespec"))
737737
.enablePlugins(SbtOsgi)
@@ -770,7 +770,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
770770
"Bundle-DocURL" -> "http://www.scalatest.org/",
771771
"Bundle-Vendor" -> "Artima, Inc."
772772
)
773-
).dependsOn(scalatestCore)
773+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
774774

775775
lazy val scalatestFunSuite = Project("scalatestFunSuite", file("modules/jvm/scalatest-funsuite"))
776776
.enablePlugins(SbtOsgi)
@@ -809,7 +809,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
809809
"Bundle-DocURL" -> "http://www.scalatest.org/",
810810
"Bundle-Vendor" -> "Artima, Inc."
811811
)
812-
).dependsOn(scalatestCore)
812+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
813813

814814
lazy val scalatestFunSpec = Project("scalatestFunSpec", file("modules/jvm/scalatest-funspec"))
815815
.enablePlugins(SbtOsgi)
@@ -887,7 +887,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
887887
"Bundle-DocURL" -> "http://www.scalatest.org/",
888888
"Bundle-Vendor" -> "Artima, Inc."
889889
)
890-
).dependsOn(scalatestCore)
890+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
891891

892892
lazy val scalatestRefSpec = Project("scalatestRefSpec", file("modules/jvm/scalatest-refspec"))
893893
.enablePlugins(SbtOsgi)
@@ -965,7 +965,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
965965
"Bundle-DocURL" -> "http://www.scalatest.org/",
966966
"Bundle-Vendor" -> "Artima, Inc."
967967
)
968-
).dependsOn(scalatestCore)
968+
).dependsOn(scalatestCore, scalacticMacro % "compile-internal, test-internal")
969969

970970
lazy val scalatestDiagrams = Project("scalatestDiagrams", file("modules/jvm/scalatest-diagrams"))
971971
.enablePlugins(SbtOsgi)

0 commit comments

Comments
 (0)