Skip to content

Commit 1c83840

Browse files
Update scalatest to 3.2.x-new
- scalatestplus-scalacheck had to upgraded too - upickle/ujson do not depend on scalatest when building with dotty currently. - updated scodec/scodec-bits to latest upstream which doesn't depend on scalatest anymore, but does depend on munit, which I also upgraded, a few tweaks to these projects was required. - the upgraded munit required a patch because MacroCompat was in - scala-3.0.0-M2 but we need it to work with our snapshots releases, so I copy-pasted it to scala-3. - Also updated scala-parallel-collections to latest upstream since we don't need any special handling anymore. Co-Authored-By: Nicolas Stucki <[email protected]>
1 parent 85e48f7 commit 1c83840

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed
Submodule munit updated 162 files
Submodule scalatest updated 1599 files
Submodule scodec updated 125 files
Submodule scodec-bits updated 58 files

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

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ final case class SbtCommunityProject(
7676
val dependencyOverrides = List(
7777
// dependencyOverrides doesn't seem to understand `%%%`
7878
""""org.scalacheck" %% "scalacheck" % "1.15.2-SNAPSHOT"""",
79-
""""org.scalacheck" %% "scalacheck_sjs1" % "1.15.2-SNAPSHOT""""
79+
""""org.scalacheck" %% "scalacheck_sjs1" % "1.15.2-SNAPSHOT"""",
80+
""""org.scalatest" %% "scalatest" % "3.2.3"""",
81+
""""org.scalatest" %% "scalatest_sjs1" % "3.2.3"""",
82+
""""org.scalameta" %% "munit" % "0.7.19+7-3ce72dda-SNAPSHOT"""",
83+
""""org.scalameta" %% "munit_sjs1" % "0.7.19+7-3ce72dda-SNAPSHOT"""",
84+
""""org.scalameta" %% "munit-scalacheck" % "0.7.19+7-3ce72dda-SNAPSHOT"""",
85+
""""org.scalameta" %% "munit-scalacheck_sjs1" % "0.7.19+7-3ce72dda-SNAPSHOT"""",
86+
""""org.scalameta" %% "junit-interface" % "0.7.19+7-3ce72dda-SNAPSHOT"""",
87+
""""org.scodec" %% "scodec-bits" % "1.1-17-c6dbf21"""",
88+
""""org.scodec" %% "scodec-bits_sjs1" % "1.1-17-c6dbf21"""",
8089
)
8190

8291
private val baseCommand =
@@ -127,19 +136,19 @@ object projects:
127136
lazy val ujson = MillCommunityProject(
128137
project = "upickle",
129138
baseCommand = s"ujson.jvm[$compilerVersion]",
130-
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, geny)
139+
dependencies = List(geny)
131140
)
132141

133142
lazy val upickle = MillCommunityProject(
134143
project = "upickle",
135144
baseCommand = s"upickle.jvm[$compilerVersion]",
136-
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, geny, utest)
145+
dependencies = List(geny, utest)
137146
)
138147

139148
lazy val upickleCore = MillCommunityProject(
140149
project = "upickle",
141150
baseCommand = s"core.jvm[$compilerVersion]",
142-
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, geny, utest)
151+
dependencies = List(geny, utest)
143152
)
144153

145154
lazy val geny = MillCommunityProject(
@@ -280,21 +289,22 @@ object projects:
280289
)
281290

282291
lazy val munit = SbtCommunityProject(
283-
project = "munit",
284-
sbtTestCommand = "testsJVM/test",
292+
project = "munit",
293+
sbtTestCommand = "testsJVM/test;testsJS/test;",
294+
sbtPublishCommand = "munitJVM/publishLocal;munitJS/publishLocal;munitScalacheckJVM/publishLocal;munitScalacheckJS/publishLocal;junit/publishLocal",
285295
)
286296

287297
lazy val scodecBits = SbtCommunityProject(
288298
project = "scodec-bits",
289-
sbtTestCommand = "coreJVM/test",
290-
sbtPublishCommand = "coreJVM/publishLocal",
291-
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck)
299+
sbtTestCommand = "coreJVM/test;coreJS/test",
300+
sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
301+
dependencies = List(munit)
292302
)
293303

294304
lazy val scodec = SbtCommunityProject(
295305
project = "scodec",
296306
sbtTestCommand = "unitTests/test",
297-
dependencies = List(scalatest, scalacheck, scalatestplusScalacheck, scodecBits)
307+
dependencies = List(munit, scodecBits)
298308
)
299309

300310
lazy val scalaParserCombinators = SbtCommunityProject(

0 commit comments

Comments
 (0)