Skip to content

Commit deb8ab2

Browse files
Merge pull request #12431 from griggt/update/typelevel-stack
Community build: Update Typelevel stack
2 parents d7a922a + 7aaa056 commit deb8ab2

File tree

18 files changed

+52
-28
lines changed

18 files changed

+52
-28
lines changed

.gitmodules

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
[submodule "community-build/community-projects/requests-scala"]
101101
path = community-build/community-projects/requests-scala
102102
url = https://github.com/dotty-staging/requests-scala.git
103-
[submodule "community-build/community-projects/cats-effect-2"]
104-
path = community-build/community-projects/cats-effect-2
105-
url = https://github.com/dotty-staging/cats-effect.git
106-
branch = series/2.x
107103
[submodule "community-build/community-projects/cats-effect-3"]
108104
path = community-build/community-projects/cats-effect-3
109105
url = https://github.com/dotty-staging/cats-effect.git
@@ -196,3 +192,12 @@
196192
[submodule "community-build/community-projects/scalatestplus-testng"]
197193
path = community-build/community-projects/scalatestplus-testng
198194
url = https://github.com/dotty-staging/scalatestplus-testng.git
195+
[submodule "community-build/community-projects/munit-cats-effect"]
196+
path = community-build/community-projects/munit-cats-effect
197+
url = https://github.com/dotty-staging/munit-cats-effect.git
198+
[submodule "community-build/community-projects/scalacheck-effect"]
199+
path = community-build/community-projects/scalacheck-effect
200+
url = https://github.com/dotty-staging/scalacheck-effect.git
201+
[submodule "community-build/community-projects/fs2"]
202+
path = community-build/community-projects/fs2
203+
url = https://github.com/dotty-staging/fs2.git
Submodule cats updated 133 files
Lines changed: 0 additions & 1 deletion
This file was deleted.
Submodule cats-mtl updated 69 files
Submodule fs2 added at bb69f51
Submodule scalacheck updated 87 files
Submodule scodec updated 120 files

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

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@ object projects:
426426
sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
427427
sbtDocCommand = "coreJVM/doc",
428428
dependencies = List(munit),
429-
requiresExperimental = true,
430429
)
431430

432431
lazy val scodec = SbtCommunityProject(
@@ -435,7 +434,6 @@ object projects:
435434
// Adds <empty> package
436435
sbtDocCommand = "coreJVM/doc",
437436
dependencies = List(munit, scodecBits),
438-
requiresExperimental = true,
439437
)
440438

441439
lazy val scalaParserCombinators = SbtCommunityProject(
@@ -477,16 +475,10 @@ object projects:
477475
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",
478476
)
479477

480-
lazy val catsEffect2 = SbtCommunityProject(
481-
project = "cats-effect-2",
482-
sbtTestCommand = "test",
483-
sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc",
484-
dependencies = List(cats, disciplineMunit)
485-
)
486-
487478
lazy val catsEffect3 = SbtCommunityProject(
488479
project = "cats-effect-3",
489480
sbtTestCommand = "test",
481+
sbtPublishCommand = "publishLocal",
490482
sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc",
491483
dependencies = List(cats, coop, disciplineSpecs2, scalacheck)
492484
)
@@ -520,7 +512,7 @@ object projects:
520512

521513
lazy val disciplineMunit = SbtCommunityProject(
522514
project = "discipline-munit",
523-
sbtTestCommand = "test",
515+
sbtTestCommand = "coreJVM/test;coreJS/test",
524516
sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
525517
dependencies = List(discipline, munit)
526518
)
@@ -678,6 +670,27 @@ object projects:
678670
dependencies = List(scalatest, scalatestplusScalacheck),
679671
)
680672

673+
lazy val munitCatsEffect = SbtCommunityProject(
674+
project = "munit-cats-effect",
675+
sbtTestCommand = "ce3JVM/test; ce3JS/test",
676+
sbtPublishCommand = "ce3JVM/publishLocal; ce3JS/publishLocal",
677+
dependencies = List(munit, catsEffect3)
678+
)
679+
680+
lazy val scalacheckEffect = SbtCommunityProject(
681+
project = "scalacheck-effect",
682+
sbtTestCommand = "test",
683+
sbtPublishCommand = "publishLocal",
684+
dependencies = List(cats, catsEffect3, munit, scalacheck)
685+
)
686+
687+
lazy val fs2 = SbtCommunityProject(
688+
project = "fs2",
689+
sbtTestCommand = "coreJVM/test; coreJS/test", // io/test requires JDK9+
690+
sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
691+
dependencies = List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits)
692+
)
693+
681694
end projects
682695

683696
def allProjects = List(
@@ -721,7 +734,6 @@ def allProjects = List(
721734
projects.dottyCpsAsync,
722735
projects.scalaz,
723736
projects.endpoints4s,
724-
projects.catsEffect2,
725737
projects.catsEffect3,
726738
projects.scalaParallelCollections,
727739
projects.scalaCollectionCompat,
@@ -750,6 +762,9 @@ def allProjects = List(
750762
projects.onnxScala,
751763
projects.playJson,
752764
projects.scalatestplusTestNG,
765+
projects.munitCatsEffect,
766+
projects.scalacheckEffect,
767+
projects.fs2,
753768
)
754769

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,17 @@ end CommunityBuildTestA
114114
@Category(Array(classOf[TestCategory]))
115115
class CommunityBuildTestB extends CommunityBuildTest:
116116
@Test def cats = projects.cats.run()
117-
@Test def catsEffect2 = projects.catsEffect2.run()
118117
@Test def catsEffect3 = projects.catsEffect3.run()
119118
@Test def catsMtl = projects.catsMtl.run()
120119
@Test def coop = projects.coop.run()
121120
@Test def discipline = projects.discipline.run()
122121
@Test def disciplineMunit = projects.disciplineMunit.run()
123122
@Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
123+
@Test def fs2 = projects.fs2.run()
124124
@Test def munit = projects.munit.run()
125+
@Test def munitCatsEffect = projects.munitCatsEffect.run()
125126
@Test def perspective = projects.perspective.run()
127+
@Test def scalacheckEffect = projects.scalacheckEffect.run()
126128
@Test def scodec = projects.scodec.run()
127129
@Test def scodecBits = projects.scodecBits.run()
128130
@Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()

0 commit comments

Comments
 (0)