diff --git a/.gitmodules b/.gitmodules index b61a6eaf411f..6721cb79e742 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,10 +100,6 @@ [submodule "community-build/community-projects/requests-scala"] path = community-build/community-projects/requests-scala url = https://github.com/dotty-staging/requests-scala.git -[submodule "community-build/community-projects/cats-effect-2"] - path = community-build/community-projects/cats-effect-2 - url = https://github.com/dotty-staging/cats-effect.git - branch = series/2.x [submodule "community-build/community-projects/cats-effect-3"] path = community-build/community-projects/cats-effect-3 url = https://github.com/dotty-staging/cats-effect.git @@ -196,3 +192,12 @@ [submodule "community-build/community-projects/scalatestplus-testng"] path = community-build/community-projects/scalatestplus-testng url = https://github.com/dotty-staging/scalatestplus-testng.git +[submodule "community-build/community-projects/munit-cats-effect"] + path = community-build/community-projects/munit-cats-effect + url = https://github.com/dotty-staging/munit-cats-effect.git +[submodule "community-build/community-projects/scalacheck-effect"] + path = community-build/community-projects/scalacheck-effect + url = https://github.com/dotty-staging/scalacheck-effect.git +[submodule "community-build/community-projects/fs2"] + path = community-build/community-projects/fs2 + url = https://github.com/dotty-staging/fs2.git diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats index 2c27eb8b6fe5..878472d7bff4 160000 --- a/community-build/community-projects/cats +++ b/community-build/community-projects/cats @@ -1 +1 @@ -Subproject commit 2c27eb8b6fe567d5a7adcb8433646d6f718d3e94 +Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541 diff --git a/community-build/community-projects/cats-effect-2 b/community-build/community-projects/cats-effect-2 deleted file mode 160000 index f3d3bb3428fa..000000000000 --- a/community-build/community-projects/cats-effect-2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3d3bb3428faa9b2495310dfd520844c37018042 diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3 index 04155e429e23..af11317d40ce 160000 --- a/community-build/community-projects/cats-effect-3 +++ b/community-build/community-projects/cats-effect-3 @@ -1 +1 @@ -Subproject commit 04155e429e230224e61235c4e4dd125419f82f7a +Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0 diff --git a/community-build/community-projects/cats-mtl b/community-build/community-projects/cats-mtl index 1b0d1404f0eb..7679d606336a 160000 --- a/community-build/community-projects/cats-mtl +++ b/community-build/community-projects/cats-mtl @@ -1 +1 @@ -Subproject commit 1b0d1404f0eb104e72d4fd80c4ba285c9390fbc0 +Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c diff --git a/community-build/community-projects/coop b/community-build/community-projects/coop index d3bcd3622dc3..4babee9613a4 160000 --- a/community-build/community-projects/coop +++ b/community-build/community-projects/coop @@ -1 +1 @@ -Subproject commit d3bcd3622dc3a1f3257e2d861d724c04ab634b81 +Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline index 4e3f9678c847..b0865da0c5e0 160000 --- a/community-build/community-projects/discipline +++ b/community-build/community-projects/discipline @@ -1 +1 @@ -Subproject commit 4e3f9678c84702b079209ae9928d9b6c884a7514 +Subproject commit b0865da0c5e016ad1d45060f52885219256d3205 diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit index e0a3aee65b85..014f8ca26fef 160000 --- a/community-build/community-projects/discipline-munit +++ b/community-build/community-projects/discipline-munit @@ -1 +1 @@ -Subproject commit e0a3aee65b85bf8d6bb53037e4bc33ebfdeaedff +Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860 diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2 index b2fa931a44ee..3603b0874940 160000 --- a/community-build/community-projects/discipline-specs2 +++ b/community-build/community-projects/discipline-specs2 @@ -1 +1 @@ -Subproject commit b2fa931a44eeb6a6afa1343e57f963e73aafff59 +Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49 diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2 new file mode 160000 index 000000000000..bb69f51505d7 --- /dev/null +++ b/community-build/community-projects/fs2 @@ -0,0 +1 @@ +Subproject commit bb69f51505d7871af318da56be5281f25fa6b5af diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect new file mode 160000 index 000000000000..5a4ee90a625e --- /dev/null +++ b/community-build/community-projects/munit-cats-effect @@ -0,0 +1 @@ +Subproject commit 5a4ee90a625e01c47421a17d1b093b2f27b9f2c5 diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck index ad6b6f997a91..976db31cd549 160000 --- a/community-build/community-projects/scalacheck +++ b/community-build/community-projects/scalacheck @@ -1 +1 @@ -Subproject commit ad6b6f997a9189dc9abdb187440cad4de5c33720 +Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845 diff --git a/community-build/community-projects/scalacheck-effect b/community-build/community-projects/scalacheck-effect new file mode 160000 index 000000000000..a275735caed7 --- /dev/null +++ b/community-build/community-projects/scalacheck-effect @@ -0,0 +1 @@ +Subproject commit a275735caed75eeb49b8ba1c4ef85d72ca6b61d8 diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec index 84db5f776573..18047cac1feb 160000 --- a/community-build/community-projects/scodec +++ b/community-build/community-projects/scodec @@ -1 +1 @@ -Subproject commit 84db5f7765738024aebd8df2bf53151cc6d4d793 +Subproject commit 18047cac1febc840e03dee91a31183d64e632222 diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits index 85de35c014b9..d513312fbfc9 160000 --- a/community-build/community-projects/scodec-bits +++ b/community-build/community-projects/scodec-bits @@ -1 +1 @@ -Subproject commit 85de35c014b948f0dd3f94e975c42d17deab4055 +Subproject commit d513312fbfc9fd54d0d3cde914b37e7755f7f6f4 diff --git a/community-build/community-projects/simulacrum-scalafix b/community-build/community-projects/simulacrum-scalafix index 75f7e10d30fb..2515271c46ad 160000 --- a/community-build/community-projects/simulacrum-scalafix +++ b/community-build/community-projects/simulacrum-scalafix @@ -1 +1 @@ -Subproject commit 75f7e10d30fb1b848b7adaf2a026320ee548b56a +Subproject commit 2515271c46ad46512a43d20e1e8ae0793433cf0b diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 106952d1cb2a..70b7a474022d 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -426,7 +426,6 @@ object projects: sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", sbtDocCommand = "coreJVM/doc", dependencies = List(munit), - requiresExperimental = true, ) lazy val scodec = SbtCommunityProject( @@ -435,7 +434,6 @@ object projects: // Adds package sbtDocCommand = "coreJVM/doc", dependencies = List(munit, scodecBits), - requiresExperimental = true, ) lazy val scalaParserCombinators = SbtCommunityProject( @@ -477,16 +475,10 @@ object projects: sbtDocCommand = ";json-schemaJVM/doc ;algebraJVM/doc; openapiJVM/doc; http4s-server/doc ;http4s-client/doc ;play-server/doc ;play-client/doc ;akka-http-server/doc ;akka-http-client/doc", ) - lazy val catsEffect2 = SbtCommunityProject( - project = "cats-effect-2", - sbtTestCommand = "test", - sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc", - dependencies = List(cats, disciplineMunit) - ) - lazy val catsEffect3 = SbtCommunityProject( project = "cats-effect-3", sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", dependencies = List(cats, coop, disciplineSpecs2, scalacheck) ) @@ -520,7 +512,7 @@ object projects: lazy val disciplineMunit = SbtCommunityProject( project = "discipline-munit", - sbtTestCommand = "test", + sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", dependencies = List(discipline, munit) ) @@ -678,6 +670,27 @@ object projects: dependencies = List(scalatest, scalatestplusScalacheck), ) + lazy val munitCatsEffect = SbtCommunityProject( + project = "munit-cats-effect", + sbtTestCommand = "ce3JVM/test; ce3JS/test", + sbtPublishCommand = "ce3JVM/publishLocal; ce3JS/publishLocal", + dependencies = List(munit, catsEffect3) + ) + + lazy val scalacheckEffect = SbtCommunityProject( + project = "scalacheck-effect", + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", + dependencies = List(cats, catsEffect3, munit, scalacheck) + ) + + lazy val fs2 = SbtCommunityProject( + project = "fs2", + sbtTestCommand = "coreJVM/test; coreJS/test", // io/test requires JDK9+ + sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal", + dependencies = List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits) + ) + end projects def allProjects = List( @@ -721,7 +734,6 @@ def allProjects = List( projects.dottyCpsAsync, projects.scalaz, projects.endpoints4s, - projects.catsEffect2, projects.catsEffect3, projects.scalaParallelCollections, projects.scalaCollectionCompat, @@ -750,6 +762,9 @@ def allProjects = List( projects.onnxScala, projects.playJson, projects.scalatestplusTestNG, + projects.munitCatsEffect, + projects.scalacheckEffect, + projects.fs2, ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 5576b95afba5..06425cbe6ff9 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -114,15 +114,17 @@ end CommunityBuildTestA @Category(Array(classOf[TestCategory])) class CommunityBuildTestB extends CommunityBuildTest: @Test def cats = projects.cats.run() - @Test def catsEffect2 = projects.catsEffect2.run() @Test def catsEffect3 = projects.catsEffect3.run() @Test def catsMtl = projects.catsMtl.run() @Test def coop = projects.coop.run() @Test def discipline = projects.discipline.run() @Test def disciplineMunit = projects.disciplineMunit.run() @Test def disciplineSpecs2 = projects.disciplineSpecs2.run() + @Test def fs2 = projects.fs2.run() @Test def munit = projects.munit.run() + @Test def munitCatsEffect = projects.munitCatsEffect.run() @Test def perspective = projects.perspective.run() + @Test def scalacheckEffect = projects.scalacheckEffect.run() @Test def scodec = projects.scodec.run() @Test def scodecBits = projects.scodecBits.run() @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()