Upgrade deps and remove Scalaz

Author: japgolly

README.md

@@ -62,7 +62,7 @@ This is a library that:
 * Comes with various `DomZipper` implementations and backends.
 * Lots of platform-specific utilities for web testing.
 * Configurable error handling. Be impure and throw exceptions or be pure and use a custom ADT to precisely maintain all forms of failure and error in your domain; it's up to you.
-* Extension modules for various 3rd-party libraries. (Scalaz, Cats, more.)
+* Extension modules for various 3rd-party libraries. (Cats, more.)
 
 
 # How does this work?
@@ -103,7 +103,6 @@ When retries are enabled, then test execution is
 | `ext-cats`            | Extensions for [Cats](https://github.com/typelevel/cats). | JVM | JS |
 | `ext-nyaya`           | Extensions for [Nyaya](https://github.com/japgolly/nyaya). | JVM | JS |
 | `ext-scalajs-react`   | Extensions for [scalajs-react](https://github.com/japgolly/scalajs-react). | | JS |
-| `ext-scalaz`          | Extensions for [Scalaz](https://github.com/scalaz/scalaz). | JVM | JS |
 | `ext-selenium`        | Extensions for [Selenium](https://www.seleniumhq.org). | JVM | |
 
 

build.sbt

@@ -22,8 +22,6 @@ val extCatsJS         = TestState.extCatsJS
 val extNyayaJVM       = TestState.extNyayaJVM
 val extNyayaJS        = TestState.extNyayaJS
 val extScalaJsReact   = TestState.extScalaJsReact
-val extScalazJVM      = TestState.extScalazJVM
-val extScalazJS       = TestState.extScalazJS
 val extSelenium       = TestState.extSelenium
 
 val examples          = TestState.examples

core/js/src/main/scala/teststate/typeclass/Platform.scala

@@ -1,7 +1,10 @@
 package teststate.typeclass
 
+import scala.annotation.nowarn
+
 private[typeclass] object Platform {
 
+  @nowarn("cat=unused")
   def threadSleep(timeMs: Long): Unit =
     System.err.print("Thread.sleep() unavailable on JavaScript.")
 

core/shared/src/test/scala/teststate/ActionTest.scala

@@ -1,7 +1,7 @@
 package teststate
 
-import scalaz.std.string._
-import scalaz.std.vector._
+import cats.instances.string._
+import cats.instances.vector._
 import teststate.Exports._
 import teststate.TestUtil._
 import teststate.data.VectorTree

core/shared/src/test/scala/teststate/CompositionTest.scala

@@ -1,8 +1,8 @@
 package teststate
 
+import cats.instances.string._
 import nyaya.prop._
 import nyaya.test.PropTest._
-import scalaz.std.string.stringInstance
 import teststate.Exports._
 import teststate.RandomData.*
 import teststate.TestUtil._

core/shared/src/test/scala/teststate/TestUtils.scala

@@ -1,5 +1,6 @@
 package teststate
 
+import cats.Eq
 import sourcecode.Line
 import teststate.Exports._
 
@@ -8,8 +9,8 @@ object TestUtil extends TestUtil
 trait TestUtil
   extends japgolly.microlibs.testutil.TestUtil {
 
-  implicit def testStateEqualityToScalaz[A](implicit e: Equal[A]): scalaz.Equal[A] =
-    scalaz.Equal.equal(e.equal)
+  implicit def testStateEqualityToCats[A](implicit e: Equal[A]): Eq[A] =
+    Eq.instance(e.equal)
 
   val inspectionBaseSettings =
     Report.Format.Default
@@ -32,7 +33,7 @@ trait TestUtil
     if (expectDefined)
       assertEq(name, o.isDefined, true)
     else
-      assertEq(name, o, None)(scalaz.Equal.equalA, l)
+      assertEq(name, o, None)(Eq.fromUniversalEquals, l)
 
   val trim = (_: String).trim
   val stringIdFn = (s: String) => s

core/shared/src/test/scala/teststate/dsl/OptionAssertionsTest.scala

@@ -1,9 +1,8 @@
 package teststate.dsl
 
+import cats.instances.option._
+import cats.instances.string._
 import japgolly.microlibs.testutil.TestUtil._
-import scalaz.std.anyVal._
-import scalaz.std.option._
-import scalaz.std.string._
 import teststate.Exports._
 import teststate.dsl.OptionAssertions._
 import utest._

doc/TYPES.md

@@ -66,9 +66,9 @@ Plan(action, invariants)            // Plan                [Id, Ref, Obs, Int, S
 | Type | Desc |
 |------|------|
 | `Display[A]` | Typeclass used by `Dsl` assertions to turn expectation and actual values into `String`s for display. (For humans, unlike common `Show[A]`.) |
-| `Equal[A]` | Typeclass used by `Dsl` assertions for equality checking. Implicit conversions exist from: <ul><li>`japgolly.univeq.UnivEq[A]`.</li><li>`cats.Eq[A]` if using the Cats module.</li><li>`scalaz.Equal` if using the Scalaz module.</li></ul> |
+| `Equal[A]` | Typeclass used by `Dsl` assertions for equality checking. Implicit conversions exist from: <ul><li>`japgolly.univeq.UnivEq[A]`.</li><li>`cats.Eq[A]` if using the Cats module.</li></ul> |
 | `ExecutionModel[F[_]]` | Typeclass required to run tests in custom contexts. |
 | `Observer[-R, +O, +E]` | Creates observations. As indicate by type variance, ref comes in, observation or error come out. |
-| `Or[+A,+B]` | Disjunction. Internal replacement for stdlib's atrocious `Either`. Implicit conversions exist from: <ul><li>`scala.util.Either[A, B]`.</li><li>`cats.data.Xor[A,B]` if using the Cats module.</li><li>`scalaz.\/[A,B]` if using the Scalaz module.</li></ul> |
+| `Or[+A,+B]` | Disjunction. Internal replacement for stdlib's atrocious `Either`. Implicit conversions exist from: <ul><li>`scala.util.Either[A, B]`.</li><li>`cats.data.Xor[A,B]` if using the Cats module.</li></ul> |
 | `Attempt[+E]` | Turns a `Throwable` into an `E`. |
 | `Report.AssertionSettings` | Typeclass that specifies how to display pass/fail results on a `Report`. |

doc/USAGE.md

@@ -19,23 +19,20 @@
       "com.github.japgolly.test-state" %%% "ext-cats"          % TestStateVer % "test",
       "com.github.japgolly.test-state" %%% "ext-nyaya"         % TestStateVer % "test",
       "com.github.japgolly.test-state" %%% "ext-scalajs-react" % TestStateVer % "test",
-      "com.github.japgolly.test-state" %%% "ext-scalaz"        % TestStateVer % "test")
+    )
     ```
 
     <br>Please note that if your sbt is setup to use [scalajs-bundler](https://scalacenter.github.io/scalajs-bundler/), *currently* you still need to enable the older JsDependenciesPlugin for the js dependencies from above to be included in your final js file. For example:
+
     ```scala
        lazy val client = (project in file("client"))
           .enablePlugins(ScalaJSPlugin)
           .enablePlugins(ScalaJSBundlerPlugin)
           .enablePlugins(JSDependenciesPlugin)   ← This is needed even if you are managing your other js depndencies using scalajs-bundler
-   
-       npmDependencies in Compile ++= Seq( "react"     -> "16.13.1", "react-dom" -> "16.13.1") ← scalajs-bundler style external js dependencies 
-       ....
-    ```        
-    
-    
-    
 
+       npmDependencies in Compile ++= Seq( "react"     -> "16.13.1", "react-dom" -> "16.13.1") ← scalajs-bundler style external js dependencies
+       ....
+    ```
 
 1. Create a configuration for your needs.
     <br>Each module has a `trait` containing all of its public API.
@@ -52,7 +49,6 @@
          with teststate.ExtCats
          with teststate.ExtNyaya
          with teststate.ExtScalaJsReact
-         with teststate.ExtScalaz
     {
       // Additional config here if desired.
 
@@ -73,7 +69,7 @@
 
 1. On your `Test`, call `.run` to execute it.
     <br>*(Technically execution depends on the context as described in [TYPES.md](TYPES.md).
-    E.g. if the context is a `scalaz.effect.IO` then nothing will have been executed yet and you're free to call `.unsafePerformIO` yourself.)*
+    E.g. if the context is a `cats.effect.IO` then nothing will have been executed yet and you're free to call `.unsafePerformIO` yourself.)*
 
 1. The result will be a `Report[E]` where `E` (the error type) is by default a `String`.
    You're free to inspect the results if desired but...

doc/changelog/2.5.0.md

@@ -2,8 +2,5 @@
 
 * Drop support for Scala.JS 0.6.x
 * Drop support for Scala 2.12
-
-* Upgrade dependencies:
-  * Scala.JS 1.6.0
-  * scalajs-react 1.7.5
-  * scalajs-dom 1.1.0
+* Drop support for Scalaz
+* Upgrade all dependencies

dom-zipper-jsoup/src/test/scala/teststate/domzipper/jsoup/DomZipperJsoupTest.scala

@@ -1,12 +1,11 @@
 package teststate.domzipper.jsoup
 
+import cats.instances.option._
+import cats.instances.set._
+import cats.instances.string._
+import cats.instances.vector._
 import japgolly.microlibs.testutil.TestUtil._
 import org.jsoup.Jsoup
-import scalaz.std.anyVal._
-import scalaz.std.option._
-import scalaz.std.set._
-import scalaz.std.string._
-import scalaz.std.vector._
 import teststate.domzipper.jsoup.Exports._
 import utest._
 

dom-zipper-selenium/src/test/scala/teststate/domzipper/selenium/DomZipperSeleniumTest.scala

@@ -1,13 +1,12 @@
 package teststate.domzipper.selenium
 
+import cats.instances.option._
+import cats.instances.set._
+import cats.instances.string._
+import cats.instances.vector._
 import japgolly.microlibs.testutil.TestUtil._
 import java.util.concurrent.TimeUnit
 import org.openqa.selenium.chrome.{ChromeDriver, ChromeOptions}
-import scalaz.std.anyVal._
-import scalaz.std.option._
-import scalaz.std.set._
-import scalaz.std.string._
-import scalaz.std.vector._
 import teststate.domzipper.selenium.Exports._
 import utest._
 

dom-zipper-selenium/src/test/scala/teststate/domzipper/selenium/FastDomZipperSeleniumTest.scala

@@ -1,13 +1,12 @@
 package teststate.domzipper.selenium
 
+import cats.instances.option._
+import cats.instances.set._
+import cats.instances.string._
+import cats.instances.vector._
 import japgolly.microlibs.testutil.TestUtil._
 import java.util.concurrent.TimeUnit
 import org.openqa.selenium.chrome.{ChromeDriver, ChromeOptions}
-import scalaz.std.anyVal._
-import scalaz.std.option._
-import scalaz.std.set._
-import scalaz.std.string._
-import scalaz.std.vector._
 import teststate.domzipper.selenium.Exports._
 import utest._
 

dom-zipper-sizzle/src/test/scala/teststate/domzipper/DomZipperJsTest.scala

@@ -1,18 +1,15 @@
 package teststate.domzipper
 
+import cats.instances.option._
+import cats.instances.set._
+import cats.instances.string._
+import cats.instances.vector._
 import japgolly.microlibs.testutil.TestUtil.assertEq
 import org.scalajs.dom
-import scalaz.Equal
-import scalaz.std.anyVal._
-import scalaz.std.option._
-import scalaz.std.set._
-import scalaz.std.string._
-import scalaz.std.vector._
 import teststate.domzipper.sizzle.Exports._
 import utest._
 
 object DomZipperJsTest extends TestSuite {
-  Equal.equalA
 
   private def body =
     """

dom-zipper/shared/src/main/scala/teststate/domzipper/ErrorHandler.scala

@@ -75,12 +75,4 @@ object ErrorHandler {
     override def map[A, B](r: Option[A])(f: A => B)             = r map f
     override def flatMap[A, B](r: Option[A])(f: A => Option[B]) = r flatMap f
   }
-
-//  object ReturnDisjunction extends ErrorHandler {
-//    import scalaz._
-//    override type Result[A]                         = String \/ A
-//    override def pass[A](a: A)                      = \/-(a)
-//    override def fail[A](e: => String)              = -\/(e)
-//    override def map[A, B](r: Result[A])(f: A => B) = r map f
-//  }
 }

ext-scalaz/shared/src/main/scala/teststate/ExtScalaz.scala

@@ -1,7 +1,7 @@
 package teststate.selenium
 
+import cats.instances.string._
 import japgolly.microlibs.testutil.TestUtil._
-import scalaz.std.string._
 import utest._
 
 object GrowthStrategyTest extends TestSuite {