From 783bd79e1f2205faa94ebee20d824f9d404effb6 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Wed, 9 Apr 2025 12:28:48 +0000 Subject: [PATCH 1/2] Update some Community Build B projects Updated projects: cats cats-effect-3 cats-mtl coops discipline discipline-munit discipline-specs2 fs2 http4s munit munit-cats-effect scalacheck scalacheck-effect scalatest Added project: munit-scalacheck --- .gitmodules | 3 ++ community-build/community-projects/cats | 2 +- .../community-projects/cats-effect-3 | 2 +- community-build/community-projects/cats-mtl | 2 +- community-build/community-projects/coop | 2 +- community-build/community-projects/discipline | 2 +- .../community-projects/discipline-munit | 2 +- .../community-projects/discipline-specs2 | 2 +- community-build/community-projects/fs2 | 2 +- community-build/community-projects/http4s | 2 +- community-build/community-projects/munit | 2 +- .../community-projects/munit-cats-effect | 2 +- .../community-projects/munit-scalacheck | 1 + community-build/community-projects/scalacheck | 2 +- .../community-projects/scalacheck-effect | 2 +- community-build/community-projects/scalatest | 2 +- .../scala/dotty/communitybuild/projects.scala | 34 ++++++++++++------- 17 files changed, 39 insertions(+), 27 deletions(-) create mode 160000 community-build/community-projects/munit-scalacheck diff --git a/.gitmodules b/.gitmodules index 8f87e992013a..52a86718f549 100644 --- a/.gitmodules +++ b/.gitmodules @@ -221,3 +221,6 @@ [submodule "community-build/community-projects/shapeless-3"] path = community-build/community-projects/shapeless-3 url = https://github.com/dotty-staging/shapeless-3.git +[submodule "community-build/community-projects/munit-scalacheck"] + path = community-build/community-projects/munit-scalacheck + url = https://github.com/dotty-staging/munit-scalacheck.git diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats index 771c6c802f59..e4086ed60e80 160000 --- a/community-build/community-projects/cats +++ b/community-build/community-projects/cats @@ -1 +1 @@ -Subproject commit 771c6c802f59c72dbc1be1898081c9c882ddfeb0 +Subproject commit e4086ed60e801b87ac8a47031ad6561eef689c8e diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3 index 1d425e6efdf8..6e2147300594 160000 --- a/community-build/community-projects/cats-effect-3 +++ b/community-build/community-projects/cats-effect-3 @@ -1 +1 @@ -Subproject commit 1d425e6efdf8aee619a4a906e950473c51f78161 +Subproject commit 6e214730059411735a81aac7ac371fdd6ad166c7 diff --git a/community-build/community-projects/cats-mtl b/community-build/community-projects/cats-mtl index 0ab7aa1cc8a0..afdc024552bc 160000 --- a/community-build/community-projects/cats-mtl +++ b/community-build/community-projects/cats-mtl @@ -1 +1 @@ -Subproject commit 0ab7aa1cc8a087693b2b04c8a9cb63f69f4af54a +Subproject commit afdc024552bc872a9500ba5c9987629ac55f6235 diff --git a/community-build/community-projects/coop b/community-build/community-projects/coop index 8700dde73ef1..d9ced8583154 160000 --- a/community-build/community-projects/coop +++ b/community-build/community-projects/coop @@ -1 +1 @@ -Subproject commit 8700dde73ef16a6135014840c4e33361dbd015d7 +Subproject commit d9ced8583154b1e993aa08aef4b1b6d1e722940e diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline index 27016c356287..adf3da08523a 160000 --- a/community-build/community-projects/discipline +++ b/community-build/community-projects/discipline @@ -1 +1 @@ -Subproject commit 27016c3562871c136e88cc13ffa64a02380265df +Subproject commit adf3da08523a881e20d6a0a8389b4c31e52b3bc1 diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit index 975ae3efaddd..6b66c54fd77b 160000 --- a/community-build/community-projects/discipline-munit +++ b/community-build/community-projects/discipline-munit @@ -1 +1 @@ -Subproject commit 975ae3efadddaa558435c4c8326628618048fdad +Subproject commit 6b66c54fd77b43886fc9e6d855a32afb5040bf2c diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2 index eb9427335a30..ee5db7068567 160000 --- a/community-build/community-projects/discipline-specs2 +++ b/community-build/community-projects/discipline-specs2 @@ -1 +1 @@ -Subproject commit eb9427335a309d6dd1e82632298529ca6a0920fa +Subproject commit ee5db70685672bf2299f51d6d3a9ad68208cfd95 diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2 index e91c54621b76..c106d778c0cd 160000 --- a/community-build/community-projects/fs2 +++ b/community-build/community-projects/fs2 @@ -1 +1 @@ -Subproject commit e91c54621b762a58c942b6576c42dcd94ba0fc0a +Subproject commit c106d778c0cdf9e18f6f4d82bd36e7d3f57530b6 diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s index aa85f5f2e660..0038c8181ce6 160000 --- a/community-build/community-projects/http4s +++ b/community-build/community-projects/http4s @@ -1 +1 @@ -Subproject commit aa85f5f2e660d1d4370d90316333718fd6517051 +Subproject commit 0038c8181ce69f55e98e17a635f2e6b3446dfe2a diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit index c5d6f474fa0d..4783fc112cce 160000 --- a/community-build/community-projects/munit +++ b/community-build/community-projects/munit @@ -1 +1 @@ -Subproject commit c5d6f474fa0d481e2c29f15d6a67d10ef2099e78 +Subproject commit 4783fc112cce07f57ffcdf3eca5b659c0137a9c5 diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect index 40e442827669..48f14b662716 160000 --- a/community-build/community-projects/munit-cats-effect +++ b/community-build/community-projects/munit-cats-effect @@ -1 +1 @@ -Subproject commit 40e44282766919a105e9dbbccbc3d14b79fee335 +Subproject commit 48f14b662716ca5ec841d824ca991c37f66f51d2 diff --git a/community-build/community-projects/munit-scalacheck b/community-build/community-projects/munit-scalacheck new file mode 160000 index 000000000000..f2c362210002 --- /dev/null +++ b/community-build/community-projects/munit-scalacheck @@ -0,0 +1 @@ +Subproject commit f2c362210002f0b3754cc2c07bddf91b4d130cbd diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck index fbfaabd7b628..c9aa8d393b02 160000 --- a/community-build/community-projects/scalacheck +++ b/community-build/community-projects/scalacheck @@ -1 +1 @@ -Subproject commit fbfaabd7b628e9b0d8f78ed8a91a0672cf56ba15 +Subproject commit c9aa8d393b0297e037c1ff49e4d82f7cb1b86193 diff --git a/community-build/community-projects/scalacheck-effect b/community-build/community-projects/scalacheck-effect index 108982f47734..cc2f993f2719 160000 --- a/community-build/community-projects/scalacheck-effect +++ b/community-build/community-projects/scalacheck-effect @@ -1 +1 @@ -Subproject commit 108982f4773430fd264e4f223ad280d02b4f7969 +Subproject commit cc2f993f2719a7aa3fd4fecf64cabd783441be3f diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index d6eeedbfc1e0..1e5a26a0b0d5 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit d6eeedbfc1e04f2eff55506f07f93f448cc21407 +Subproject commit 1e5a26a0b0d5f5e9a859899d09666053fee1932c diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index b575bd2eadf8..7e0604840ef7 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -397,12 +397,20 @@ object projects: lazy val munit = SbtCommunityProject( project = "munit", - sbtTestCommand = "testsJVM/test;testsJS/test;", - sbtPublishCommand = "munitJVM/publishLocal; munitJS/publishLocal; munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal; junit/publishLocal", + sbtTestCommand = "testsJVM/test;testsJS/test;munitDiffJVM/test;munitDiffJS/test", + sbtPublishCommand = "munitJVM/publishLocal; munitJS/publishLocal; munitDiffJVM/publishLocal; munitDiffJS/publishLocal; junit/publishLocal", sbtDocCommand = "junit/doc; munitJVM/doc", dependencies = List(scalacheck) ) + lazy val munitScalacheck = SbtCommunityProject( + project = "munit-scalacheck", + sbtTestCommand = "testsJVM/test;testsJS/test;", + sbtPublishCommand = "munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal", + sbtDocCommand = "munitScalacheckJVM/doc", + dependencies = List(munit, scalacheck) + ) + lazy val scodecBits = SbtCommunityProject( project = "scodec-bits", sbtTestCommand = "coreJVM/test;coreJS/test", @@ -462,7 +470,7 @@ object projects: lazy val catsEffect3 = SbtCommunityProject( project = "cats-effect-3", sbtTestCommand = "ciJVM", - sbtPublishCommand = "publishLocal", + sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal; kernelJVM/publishLocal; kernelJS/publishLocal; stdJVM/publishLocal; stdJS/publishLocal", sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", dependencies = List(cats, coop, disciplineSpecs2, scalacheck) ) @@ -505,12 +513,12 @@ object projects: project = "discipline-munit", sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", - dependencies = List(discipline, munit) + dependencies = List(discipline, munit, munitScalacheck) ) lazy val disciplineSpecs2 = SbtCommunityProject( project = "discipline-specs2", - sbtTestCommand = "test", + sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", dependencies = List(discipline), scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init") @@ -524,8 +532,8 @@ object projects: lazy val cats = SbtCommunityProject( project = "cats", - sbtTestCommand = "set Global/scalaJSStage := FastOptStage;rootJVM/test;rootJS/test", - sbtPublishCommand = "rootJVM/publishLocal;rootJS/publishLocal", + sbtTestCommand = "set Global/scalaJSStage := FastOptStage;catsJVM/test;catsJS/test", + sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal", dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations), scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init") // disable -Ysafe-init or -Wsafe-init, due to -Xfatal-warning ) @@ -539,7 +547,7 @@ object projects: lazy val coop = SbtCommunityProject( project = "coop", - sbtTestCommand = "test", + sbtTestCommand = "rootJVM/test;rootJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", dependencies = List(cats, catsMtl) ) @@ -677,16 +685,16 @@ object projects: lazy val munitCatsEffect = SbtCommunityProject( project = "munit-cats-effect", - sbtTestCommand = "ce3JVM/test; ce3JS/test", - sbtPublishCommand = "ce3JVM/publishLocal; ce3JS/publishLocal", + sbtTestCommand = "rootJVM/test; rootJS/test", + sbtPublishCommand = "rootJVM/publishLocal; rootJS/publishLocal", dependencies = List(munit, catsEffect3) ) lazy val scalacheckEffect = SbtCommunityProject( project = "scalacheck-effect", - sbtTestCommand = "test", - sbtPublishCommand = "publishLocal", - dependencies = List(cats, catsEffect3, munit, scalacheck) + sbtTestCommand = "rootJVM/test; rootJS/test", + sbtPublishCommand = "rootJVM/publishLocal; rootJS/publishLocal", + dependencies = List(cats, catsEffect3, munit, munitScalacheck, scalacheck) ) lazy val fs2 = SbtCommunityProject( From f63ab6f40086a08925722b39653856179a959fab Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Tue, 15 Apr 2025 11:58:11 +0000 Subject: [PATCH 2/2] [Temporary] Show warnings --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 7e0604840ef7..0d156a932d05 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -106,7 +106,7 @@ final case class SbtCommunityProject( scalacOptions.map("\"" + _ + "\"").mkString("List(", ",", ")") private val baseCommand = - "clean; set Global/logLevel := Level.Error; set Global/updateOptions ~= (_.withLatestSnapshots(false)); " + "clean; set Global/updateOptions ~= (_.withLatestSnapshots(false)); " ++ (if scalacOptions.isEmpty then "" else s"""set Global/scalacOptions ++= $scalacOptionsString;""") ++ s"++$compilerVersion!; "