Skip to content

Commit 321cb84

Browse files
Merge pull request #12089 from griggt/update/scalatest-3.2.7
Community build: update ScalaTest and friends to 3.2.7
2 parents 59ea58e + eaac97a commit 321cb84

File tree

7 files changed

+28
-8
lines changed

7 files changed

+28
-8
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,6 @@
193193
[submodule "community-build/community-projects/play-json"]
194194
path = community-build/community-projects/play-json
195195
url = https://github.com/dotty-staging/play-json.git
196+
[submodule "community-build/community-projects/scalatestplus-testng"]
197+
path = community-build/community-projects/scalatestplus-testng
198+
url = https://github.com/dotty-staging/scalatestplus-testng.git
Submodule scalatest updated 239 files

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ sealed trait CommunityProject:
4040
val publishCommand: String
4141
val docCommand: String
4242
val dependencies: List[CommunityProject]
43+
val testOnlyDependencies: () => List[CommunityProject]
4344
val binaryName: String
4445
val runCommandsArgs: List[String] = Nil
4546
val requiresExperimental: Boolean
@@ -87,6 +88,7 @@ final case class MillCommunityProject(
8788
project: String,
8889
baseCommand: String,
8990
dependencies: List[CommunityProject] = Nil,
91+
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
9092
ignoreDocs: Boolean = false,
9193
requiresExperimental: Boolean = false,
9294
) extends CommunityProject:
@@ -104,6 +106,7 @@ final case class SbtCommunityProject(
104106
sbtTestCommand: String,
105107
extraSbtArgs: List[String] = Nil,
106108
dependencies: List[CommunityProject] = Nil,
109+
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
107110
sbtPublishCommand: String = null,
108111
sbtDocCommand: String = null,
109112
scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
@@ -273,15 +276,17 @@ object projects:
273276
sbtDocCommand = forceDoc("jvm")
274277
)
275278

276-
lazy val scalatest = SbtCommunityProject(
279+
lazy val scalatest: SbtCommunityProject = SbtCommunityProject(
277280
project = "scalatest",
278-
sbtTestCommand = "scalacticDotty/clean;scalacticTestDotty/test; scalatestTestDotty/test",
279-
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal",
280-
sbtDocCommand = ";scalacticDotty/doc" // fails with missing type ;scalatestDotty/doc"
281+
sbtTestCommand = "scalacticDotty/clean; scalacticDottyJS/clean; scalacticTestDotty/test; scalatestTestDotty/test; scalacticDottyJS/compile; scalatestDottyJS/compile",
282+
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal",
283+
sbtDocCommand = ";scalacticDotty/doc", // fails with missing type ;scalatestDotty/doc"
281284
// cannot take signature of (test: org.scalatest.concurrent.ConductorFixture#OneArgTest):
282285
// org.scalatest.Outcome
283286
// Problem parsing scalatest.dotty/target/scala-3.0.0-M2/src_managed/main/org/scalatest/concurrent/ConductorFixture.scala:[602..624..3843], documentation may not be generated.
284287
// dotty.tools.dotc.core.MissingType:
288+
dependencies = List(scalaXml),
289+
testOnlyDependencies = () => List(scalatestplusJunit, scalatestplusTestNG)
285290
)
286291

287292
lazy val scalatestplusScalacheck = SbtCommunityProject(
@@ -299,9 +304,17 @@ object projects:
299304
dependencies = List(scalatest)
300305
)
301306

307+
lazy val scalatestplusTestNG = SbtCommunityProject(
308+
project = "scalatestplus-testng",
309+
sbtTestCommand = "test",
310+
sbtPublishCommand = "publishLocal",
311+
dependencies = List(scalatest)
312+
)
313+
302314
lazy val scalaXml = SbtCommunityProject(
303315
project = "scala-xml",
304-
sbtTestCommand = "xml/test",
316+
sbtTestCommand = "xml/test",
317+
sbtPublishCommand = "xml/publishLocal",
305318
sbtDocCommand = "xml/doc"
306319
)
307320

@@ -736,6 +749,7 @@ def allProjects = List(
736749
projects.protoquill,
737750
projects.onnxScala,
738751
projects.playJson,
752+
projects.scalatestplusTestNG,
739753
)
740754

741755
lazy val projectMap = allProjects.groupBy(_.project)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ abstract class CommunityBuildTest:
2727
)
2828
return
2929
self.dependencies.foreach(_.publish())
30+
self.testOnlyDependencies().foreach(_.publish())
3031
suite.test(self)
3132

3233
/** Build the given project with the published local compiler and sbt plugin.
@@ -96,6 +97,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
9697
@Test def izumiReflect = projects.izumiReflect.run()
9798
@Test def scalaSTM = projects.scalaSTM.run()
9899
@Test def scalatest = projects.scalatest.run()
100+
@Test def scalatestplusTestNG = projects.scalatestplusTestNG.run()
99101
// 'Sciss/Lucre' dependencies:
100102
// @Test def scissEqual = projects.scissEqual .run()
101103
// @Test def scissFingerTree = projects.scissFingerTree.run()

0 commit comments

Comments
 (0)