Skip to content

Update Cats and dependent projects #22949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion community-build/community-projects/cats
Submodule cats updated 575 files
2 changes: 1 addition & 1 deletion community-build/community-projects/cats-effect-3
Submodule cats-effect-3 updated 543 files
2 changes: 1 addition & 1 deletion community-build/community-projects/cats-mtl
Submodule cats-mtl updated 66 files
+8 −0 .git-blame-ignore-revs
+296 −31 .github/workflows/ci.yml
+4 −2 .scalafmt.conf
+5 −5 README.md
+52 −145 build.sbt
+0 −0 core/src/main/scala-2.13+/cats/mtl/LowPriorityApplicativeAskInstancesCompat.scala
+0 −0 core/src/main/scala-2.13+/cats/mtl/LowPriorityApplicativeLocalInstancesCompat.scala
+0 −0 core/src/main/scala-2.13+/cats/mtl/LowPriorityFunctorListenInstancesCompat.scala
+0 −0 core/src/main/scala-2.13+/cats/mtl/LowPriorityFunctorTellInstancesCompat.scala
+0 −1 core/src/main/scala-3
+34 −3 core/src/main/scala/cats/mtl/Ask.scala
+8 −8 core/src/main/scala/cats/mtl/Censor.scala
+2 −2 core/src/main/scala/cats/mtl/Chronicle.scala
+3 −3 core/src/main/scala/cats/mtl/Listen.scala
+14 −3 core/src/main/scala/cats/mtl/Local.scala
+4 −5 core/src/main/scala/cats/mtl/MonadPartialOrder.scala
+19 −5 core/src/main/scala/cats/mtl/Raise.scala
+16 −3 core/src/main/scala/cats/mtl/Stateful.scala
+7 −2 core/src/main/scala/cats/mtl/Tell.scala
+2 −1 core/src/main/scala/cats/mtl/implicits/package.scala
+1 −0 docs/contributing.md
+0 −7 docs/design.md
+8 −0 docs/directory.conf
+8 −16 docs/getting-started.md
+ docs/img/cats-mtl-logo.png
+1 −0 docs/index.md
+0 −7 docs/migration.md
+0 −8 docs/mtl-classes.md
+0 −8 docs/mtl-classes/ask.md
+1 −9 docs/mtl-classes/chronicle.md
+1 −9 docs/mtl-classes/handle.md
+1 −9 docs/mtl-classes/listen.md
+1 −9 docs/mtl-classes/local.md
+2 −10 docs/mtl-classes/raise.md
+1 −9 docs/mtl-classes/stateful.md
+1 −9 docs/mtl-classes/tell.md
+0 −50 docs/src/main/resources/microsite/data/menu.yml
+ docs/src/main/resources/microsite/img/cats-mtl-logo-microsite.png
+ docs/src/main/resources/microsite/img/jumbotron_pattern.png
+ docs/src/main/resources/microsite/img/jumbotron_pattern2x.png
+ docs/src/main/resources/microsite/img/logo_square.png
+ docs/src/main/resources/microsite/img/navbar_brand.png
+ docs/src/main/resources/microsite/img/navbar_brand2x.png
+ docs/src/main/resources/microsite/img/sidebar_brand.png
+ docs/src/main/resources/microsite/img/sidebar_brand2x.png
+0 −18 project/Settings.scala
+1 −1 project/build.properties
+6 −10 project/plugins.sbt
+1 −0 tests/js/src/test/scala/cats/mtl/tests/Platform.scala
+1 −0 tests/jvm/src/test/scala/cats/mtl/tests/Platform.scala
+26 −0 tests/native/src/test/scala/cats/mtl/tests/Platform.scala
+43 −0 tests/shared/src/test/scala/cats/mtl/tests/AskCatsInstanceTests.scala
+2 −2 tests/shared/src/test/scala/cats/mtl/tests/BaseSuite.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/EitherTTests.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/HandleTests.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/IorTTests.scala
+42 −0 tests/shared/src/test/scala/cats/mtl/tests/LocalCatsInstanceTests.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/OptionTTests.scala
+201 −0 tests/shared/src/test/scala/cats/mtl/tests/ReaderTTests.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/ReaderWriterStateTTests.scala
+1 −1 tests/shared/src/test/scala/cats/mtl/tests/StateTTests.scala
+1 −1 tests/shared/src/test/scala/cats/mtl/tests/SummonableImplicits.scala
+1 −1 tests/shared/src/test/scala/cats/mtl/tests/Syntax.scala
+0 −0 tests/shared/src/test/scala/cats/mtl/tests/ValidatedTests.scala
+1 −1 tests/shared/src/test/scala/cats/mtl/tests/WriterTTests.scala
+0 −117 tests/src/test/scala/cats/mtl/tests/ReaderTTests.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/fs2
Submodule fs2 updated 293 files
2 changes: 1 addition & 1 deletion community-build/community-projects/http4s
Submodule http4s updated 396 files
2 changes: 1 addition & 1 deletion community-build/community-projects/munit
Submodule munit updated 245 files
2 changes: 1 addition & 1 deletion community-build/community-projects/munit-cats-effect
Submodule munit-cats-effect updated 31 files
+173 −117 .github/workflows/ci.yml
+1 −1 .scalafmt.conf
+0 −12 CODE_OF_CONDUCT.md
+25 −3 README.md
+11 −64 build.sbt
+0 −30 ce2/js/src/main/scala/munit/CatsEffectSuitePlatform.scala
+0 −32 ce2/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala
+0 −57 ce2/shared/src/main/scala/munit/CatsEffectSuite.scala
+0 −25 ce3/js/src/main/scala/munit/CatsEffectSuitePlatform.scala
+0 −28 ce3/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala
+0 −56 ce3/shared/src/main/scala/munit/CatsEffectSuite.scala
+0 −19 common/js/src/main/scala/munit/CatsEffectFixturesPlatform.scala
+0 −51 common/jvm/src/main/scala/munit/CatsEffectFixturesPlatform.scala
+0 −52 common/shared/src/main/scala/munit/CatsEffectFixtures.scala
+0 −62 common/shared/src/test/scala/munit/CatsEffectFixturesSpec.scala
+0 −79 common/shared/src/test/scala/munit/CatsEffectFunFixturesSpec.scala
+159 −0 core/src/main/scala/munit/CatsEffectAssertions.scala
+42 −0 core/src/main/scala/munit/CatsEffectFixtures.scala
+32 −34 core/src/main/scala/munit/CatsEffectFunFixtures.scala
+87 −0 core/src/main/scala/munit/CatsEffectSuite.scala
+74 −0 core/src/main/scala/munit/catseffect/ResourceFixture.scala
+0 −0 core/src/main/scala/munit/internal.scala
+22 −0 core/src/test/scala/munit/CatsEffectAssertionsSpec.scala
+70 −0 core/src/test/scala/munit/CatsEffectAssertionsSyntaxSpec.scala
+7 −5 core/src/test/scala/munit/CatsEffectFixturesSpec.scala
+56 −0 core/src/test/scala/munit/CatsEffectFunFixturesSpec.scala
+9 −0 core/src/test/scala/munit/CatsEffectSuiteSpec.scala
+1 −1 core/src/test/scala/munit/ExampleSuite.scala
+14 −4 docs/index.md
+1 −1 project/build.properties
+5 −3 project/plugins.sbt
1 change: 1 addition & 0 deletions community-build/community-projects/munit-scalacheck
Submodule munit-scalacheck added at f2c362
2 changes: 1 addition & 1 deletion community-build/community-projects/scalacheck
Submodule scalacheck updated 87 files
+13 −0 .git-blame-ignore-revs
+199 −224 .github/workflows/ci.yml
+36 −0 .scalafmt.conf
+18 −0 CHANGELOG.markdown
+0 −19 CODE_OF_CONDUCT.md
+28 −41 bench/src/main/scala/org/scalacheck/bench/GenBench.scala
+25 −32 build.sbt
+19 −15 core/js/src/main/scala/org/scalacheck/Platform.scala
+0 −4 core/js/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+0 −4 core/js/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+0 −4 core/js/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+0 −4 core/js/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+33 −29 core/jvm/src/main/scala/org/scalacheck/Platform.scala
+0 −39 core/jvm/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+11 −11 core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala
+21 −22 core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
+28 −23 core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
+122 −92 core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
+9 −10 core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala
+51 −51 core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala
+85 −20 core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala
+12 −12 core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala
+8 −8 core/jvm/src/test/scala/org/scalacheck/TestAll.scala
+60 −37 core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
+21 −6 core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala
+26 −19 core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala
+17 −14 core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
+22 −22 core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala
+12 −10 core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala
+15 −5 core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala
+20 −16 core/native/src/main/scala/org/scalacheck/Platform.scala
+0 −4 core/native/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+0 −4 core/native/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+0 −4 core/native/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+0 −4 core/native/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+9 −9 core/shared/src/main/scala-2.12-/org/scalacheck/ScalaVersionSpecific.scala
+25 −15 core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala
+9 −8 core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala
+25 −17 core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala
+92 −83 core/shared/src/main/scala/org/scalacheck/Arbitrary.scala
+43 −29 core/shared/src/main/scala/org/scalacheck/Cogen.scala
+461 −508 core/shared/src/main/scala/org/scalacheck/Gen.scala
+836 −561 core/shared/src/main/scala/org/scalacheck/Prop.scala
+35 −43 core/shared/src/main/scala/org/scalacheck/Properties.scala
+91 −77 core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
+137 −99 core/shared/src/main/scala/org/scalacheck/Shrink.scala
+194 −125 core/shared/src/main/scala/org/scalacheck/Test.scala
+174 −187 core/shared/src/main/scala/org/scalacheck/commands/Commands.scala
+38 −56 core/shared/src/main/scala/org/scalacheck/rng/Seed.scala
+23 −21 core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+64 −76 core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+17 −15 core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+40 −0 core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+20 −13 core/shared/src/main/scala/org/scalacheck/util/Buildable.scala
+33 −28 core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
+20 −21 core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala
+18 −18 core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala
+58 −62 core/shared/src/main/scala/org/scalacheck/util/Pretty.scala
+27 −0 core/shared/src/test/scala-2.12-/org/scalacheck/time/OrderingVersionSpecific.scala
+12 −13 core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala
+0 −28 core/shared/src/test/scala-2.13-/org/scalacheck/time/OrderingVersionSpecific.scala
+13 −13 core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala
+110 −39 core/shared/src/test/scala/org/scalacheck/PropSpecification.scala
+20 −19 core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala
+9 −9 core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala
+9 −0 core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala
+17 −16 core/shared/src/test/scala/org/scalacheck/examples/Examples.scala
+12 −11 core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala
+33 −14 core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala
+12 −10 core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala
+10 −10 core/shared/src/test/scala/scala/StringSpecification.scala
+24 −18 doc/UserGuide.md
+1 −1 examples/commands-leveldb/project/build.properties
+12 −16 examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala
+1 −1 examples/commands-nix/project/build.properties
+28 −30 examples/commands-nix/src/test/scala/CommandsNix.scala
+1 −1 examples/commands-redis/project/build.properties
+22 −24 examples/commands-redis/src/test/scala/CommandsRedis.scala
+1 −1 examples/scalajs/project/build.properties
+1 −2 examples/scalajs/project/plugins.sbt
+1 −1 examples/scalajs/src/test/scala/example/ScalaJSExampleTest.scala
+10 −1 examples/simple-sbt/build.sbt
+1 −1 examples/simple-sbt/project/build.properties
+31 −0 project/CustomHeaderPlugin.scala
+1 −1 project/build.properties
+157 −151 project/codegen.scala
+4 −8 project/plugin.sbt
2 changes: 1 addition & 1 deletion community-build/community-projects/scalatest
Submodule scalatest updated 1768 files
36 changes: 22 additions & 14 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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!; "

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)
)
Expand Down Expand Up @@ -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")
Expand All @@ -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
)
Expand All @@ -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)
)
Expand Down Expand Up @@ -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(
Expand Down
Loading