Skip to content

Commit dace332

Browse files
Add ujson and scalatestplus-scalacheck to the community build
1 parent 28f3da6 commit dace332

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,9 @@
6262
[submodule "community-build/community-projects/os-lib"]
6363
path = community-build/community-projects/os-lib
6464
url = https://github.com/dotty-staging/os-lib.git
65+
[submodule "community-build/community-projects/scalatestplus-scalacheck"]
66+
path = community-build/community-projects/scalatestplus-scalacheck
67+
url = https://github.com/dotty-staging/scalatestplus-scalacheck.git
68+
[submodule "community-build/community-projects/upickle"]
69+
path = community-build/community-projects/upickle
70+
url = https://github.com/dotty-staging/upickle.git
Submodule upickle added at e46ab93

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,9 @@ final case class MillCommunityProject(project: String, baseCommand: String,
8787

8888
final case class SbtCommunityProject(project: String, sbtTestCommand: String,
8989
sbtUpdateCommand: String, extraSbtArgs: List[String] = Nil,
90-
dependencies: List[CommunityProject] = Nil) extends CommunityProject
90+
dependencies: List[CommunityProject] = Nil, publishCommand: String = null) extends CommunityProject
9191
override val binaryName: String = "sbt"
9292
private val baseCommand = s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! "
93-
override val publishCommand = null
9493
override val testCommand = s"$baseCommand$sbtTestCommand"
9594
override val updateCommand = s"$baseCommand$sbtUpdateCommand"
9695

@@ -126,6 +125,12 @@ object projects
126125
dependencies = List(utest, sourcecode)
127126
)
128127

128+
val ujson = MillCommunityProject(
129+
project = "upickle",
130+
baseCommand = s"ujson.jvm[$compilerVersion]",
131+
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck)
132+
)
133+
129134
val intent = SbtCommunityProject(
130135
project = "intent",
131136
sbtTestCommand = "test",
@@ -141,13 +146,23 @@ object projects
141146
val scalacheck = SbtCommunityProject(
142147
project = "scalacheck",
143148
sbtTestCommand = "jvm/test",
144-
sbtUpdateCommand = "jvm/test:update"
149+
sbtUpdateCommand = "jvm/test:update",
150+
publishCommand = ";set jvm/publishArtifact in (Compile, packageDoc) := false ;jvm/publishLocal"
145151
)
146152

147153
val scalatest = SbtCommunityProject(
148154
project = "scalatest",
149155
sbtTestCommand = ";scalacticDotty/clean;scalacticTestDotty/test;scalatestTestDotty/test",
150-
sbtUpdateCommand = "scalatest/update"
156+
sbtUpdateCommand = "scalatest/update",
157+
publishCommand = ";scalacticDotty/publishLocal; scalatestDotty/publishLocal"
158+
)
159+
160+
val scalatestplusScalacheck = SbtCommunityProject(
161+
project = "scalatestplus-scalacheck",
162+
sbtTestCommand = "scalatestPlusScalaCheckJVM/compile", // TODO: compile only because tests are prone to java.lang.OutOfMemoryError: Metaspace
163+
sbtUpdateCommand = "scalatestPlusScalaCheckJVM/update",
164+
publishCommand = "scalatestPlusScalaCheckJVM/publishLocal",
165+
dependencies = List(scalatest, scalacheck)
151166
)
152167

153168
val scalaXml = SbtCommunityProject(
@@ -300,6 +315,7 @@ class CommunityBuildTest {
300315
@Test def algebra = projects.algebra.run()
301316
@Test def scalacheck = projects.scalacheck.run()
302317
@Test def scalatest = projects.scalatest.run()
318+
@Test def scalatestplusScalacheck = projects.scalatestplusScalacheck.run()
303319
@Test def scalaXml = projects.scalaXml.run()
304320
@Test def scopt = projects.scopt.run()
305321
@Test def scalap = projects.scalap.run()
@@ -311,6 +327,7 @@ class CommunityBuildTest {
311327
@Test def utest = projects.utest.run()
312328
@Test def sourcecode = projects.sourcecode.run()
313329
@Test def oslib = projects.oslib.run()
330+
@Test def ujson = projects.ujson.run()
314331
// @Test def oslibWatch = projects.oslibWatch.run()
315332
@Test def stdLib213 = projects.stdLib213.run()
316333
@Test def shapeless = projects.shapeless.run()

0 commit comments

Comments
 (0)