Merge branch 'main' into update/fs2-core-3.7.0

disneystreaming · Jul 30, 2023 · 3eba9ee · 3eba9ee
2 parents a9de698 + 98f9b15
commit 3eba9ee
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 13 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.1"
+version = "3.7.11"
 
 runner.dialect=scala213source3
 

diff --git a/build.sbt b/build.sbt
@@ -39,7 +39,8 @@ sonatypeCredentialHost := "s01.oss.sonatype.org"
 val Version = new {
   object CE3 {
     val fs2 = "3.7.0"
-    val ce  = "3.4.6"
+
+    val ce  = "3.4.11"
   }
 
   val expecty          = "0.16.0"
@@ -228,7 +229,7 @@ lazy val scalacheck = projectMatrix
 
 lazy val discipline = projectMatrix
   .in(file("modules/discipline"))
-  .sparse(withJS = true, withScala3 = true)
+  .full
   .dependsOn(core, cats)
   .settings(
     name           := "discipline",

diff --git a/docs/cats_effect_usage.md b/docs/cats_effect_usage.md
@@ -5,9 +5,20 @@ title: Cats-effect usage
 
 ## Installation
 
-You'll need to install the following depending to test your programs against `cats.effect.IO`
+You'll need to install the following dependencies to test your programs against `cats.effect.IO`
+
+### SBT (1.9.0+)
+
+Newer versions of SBT have [`weaver` automatically integrated](https://github.com/sbt/sbt/pull/7263).
+
+```scala
+libraryDependencies +=  "com.disneystreaming" %% "weaver-cats" % "@VERSION@" % Test
+```
+
+### SBT (older versions)
+
+Internally, SBT has a hardcoded list of test frameworks it integrates with. `weaver` must be manually added to this list.
 
-### SBT
 ```scala
 libraryDependencies +=  "com.disneystreaming" %% "weaver-cats" % "@VERSION@" % Test
 testFrameworks += new TestFramework("weaver.framework.CatsEffect")

diff --git a/modules/core/cats/src/weaver/package.scala b/modules/core/cats/src/weaver/package.scala
@@ -2,10 +2,23 @@ import cats.effect.IO
 
 package object weaver {
 
-  type IOSuite        = MutableIOSuite
-  type SimpleIOSuite  = SimpleMutableIOSuite
+  /**
+   * Extend this when each test in the suite returns an `Resource[IO, Res]` for
+   * some shared resource `Res`
+   */
+  type IOSuite = MutableIOSuite
+
+  /**
+   * Extend this when each test in the suite returns an `IO[_]`
+   */
+  type SimpleIOSuite = SimpleMutableIOSuite
+
   type GlobalResource = IOGlobalResource
   type GlobalRead     = GlobalResourceF.Read[IO]
   type GlobalWrite    = GlobalResourceF.Write[IO]
-  type FunSuite       = FunSuiteIO
+
+  /**
+   * Extend this when each test in the suite is pure and does not return `IO[_]`
+   */
+  type FunSuite = FunSuiteIO
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,11 +1,11 @@
 // format: off
-addSbtPlugin("ch.epfl.scala"        % "sbt-scalafix"                  % "0.10.4")
+addSbtPlugin("ch.epfl.scala"        % "sbt-scalafix"                  % "0.11.0")
 
-addSbtPlugin("org.scala-js"         % "sbt-scalajs"                   % "1.13.0")
+addSbtPlugin("org.scala-js"         % "sbt-scalajs"                   % "1.13.2")
 
-addSbtPlugin("org.scala-native"     % "sbt-scala-native"              % "0.4.10")
+addSbtPlugin("org.scala-native"     % "sbt-scala-native"              % "0.4.14")
 
-addSbtPlugin("com.eed3si9n"         % "sbt-projectmatrix"             % "0.9.0")
+addSbtPlugin("com.eed3si9n"         % "sbt-projectmatrix"             % "0.9.1")
 
 addSbtPlugin("com.github.sbt"       % "sbt-ci-release"                % "1.5.11")