Upgrade to cats-1.0.0-RC1 and more

typelevel · Oct 31, 2017 · b88b884 · b88b884
1 parent 542290e
commit b88b884
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/build.sbt b/build.sbt
@@ -24,12 +24,12 @@ startYear in ThisBuild := Some(2017)
 
 val CompileTime = config("CompileTime").hide
 
-val CatsVersion = "1.0.0-MF"
-val SimulacrumVersion = "0.10.0"
+val CatsVersion = "1.0.0-RC1"
+val SimulacrumVersion = "0.11.0"
 
-val ScalaTestVersion = "3.0.1"
-val ScalaCheckVersion = "1.13.4"
-val DisciplineVersion = "0.7.3"
+val ScalaTestVersion = "3.0.4"
+val ScalaCheckVersion = "1.13.5"
+val DisciplineVersion = "0.8"
 
 addCommandAlias("ci", ";test ;mimaReportBinaryIssues; doc")
 addCommandAlias("release", ";project root ;reload ;+publishSigned ;sonatypeReleaseAll")

diff --git a/core/shared/src/main/scala/cats/effect/Async.scala b/core/shared/src/main/scala/cats/effect/Async.scala
@@ -86,7 +86,7 @@ private[effect] trait AsyncInstances {
     protected def FF = F
 
     def async[A](k: (Either[Throwable, A] => Unit) => Unit): EitherT[F, L, A] =
-      EitherT.liftT(F.async(k))
+      EitherT.liftF(F.async(k))
   }
 
   private[effect] trait OptionTAsync[F[_]]

diff --git a/core/shared/src/main/scala/cats/effect/LiftIO.scala b/core/shared/src/main/scala/cats/effect/LiftIO.scala
@@ -54,7 +54,7 @@ private[effect] trait LiftIOInstances {
     private implicit def _FF = FF
 
     override def liftIO[A](ioa: IO[A]): EitherT[F, L, A] =
-      EitherT.liftT(F.liftIO(ioa))
+      EitherT.liftF(F.liftIO(ioa))
   }
 
   private[effect] trait KleisliLiftIO[F[_], R] extends LiftIO[Kleisli[F, R, ?]] {

diff --git a/core/shared/src/main/scala/cats/effect/Sync.scala b/core/shared/src/main/scala/cats/effect/Sync.scala
@@ -19,7 +19,7 @@ package effect
 
 import simulacrum._
 
-import cats.data.{EitherT, OptionT, StateT, WriterT}
+import cats.data.{EitherT, IndexedStateT, OptionT, StateT, WriterT}
 import cats.effect.internals.NonFatal
 
 /**
@@ -100,7 +100,7 @@ private[effect] trait SyncInstances {
       EitherT(F.handleErrorWith(fa.value)(f.andThen(_.value)))
 
     def raiseError[A](e: Throwable): EitherT[F, L, A] =
-      EitherT.liftT(F.raiseError(e))
+      EitherT.liftF(F.raiseError(e))
 
     def flatMap[A, B](fa: EitherT[F, L, A])(f: A => EitherT[F, L, B]): EitherT[F, L, B] =
       fa.flatMap(f)
@@ -152,7 +152,7 @@ private[effect] trait SyncInstances {
 
     // overwriting the pre-existing one, since flatMap is guaranteed stack-safe
     def tailRecM[A, B](a: A)(f: A => StateT[F, S, Either[A, B]]): StateT[F, S, B] =
-      StateT.catsDataMonadForStateT[F, S].tailRecM(a)(f)
+      IndexedStateT.catsDataMonadForIndexedStateT[F, S].tailRecM(a)(f)
 
     def suspend[A](thunk: => StateT[F, S, A]): StateT[F, S, A] =
       StateT.applyF(F.suspend(thunk.runF))

diff --git a/laws/shared/src/main/scala/cats/effect/laws/AsyncLaws.scala b/laws/shared/src/main/scala/cats/effect/laws/AsyncLaws.scala
@@ -40,7 +40,7 @@ trait AsyncLaws[F[_]] extends SyncLaws[F] {
 
     val read: F[A] = F.delay(cur)
 
-    change >> change >> read <-> F.pure(f(f(a)))
+    change *> change *> read <-> F.pure(f(f(a)))
   }
 
   def propagateErrorsThroughBindAsync[A](t: Throwable) = {

diff --git a/laws/shared/src/main/scala/cats/effect/laws/EffectLaws.scala b/laws/shared/src/main/scala/cats/effect/laws/EffectLaws.scala
@@ -29,15 +29,15 @@ trait EffectLaws[F[_]] extends AsyncLaws[F] {
     var result: Option[Either[Throwable, A]] = None
     val read = IO { result.get }
 
-    F.runAsync(fa)(e => IO { result = Some(e) }) >> read <-> IO.pure(Right(a))
+    F.runAsync(fa)(e => IO { result = Some(e) }) *> read <-> IO.pure(Right(a))
   }
 
   def runAsyncRaiseErrorProducesLeftIO[A](e: Throwable) = {
     val fa: F[A] = F.raiseError(e)
     var result: Option[Either[Throwable, A]] = None
     val read = IO { result.get }
 
-    F.runAsync(fa)(e => IO { result = Some(e) }) >> read <-> IO.pure(Left(e))
+    F.runAsync(fa)(e => IO { result = Some(e) }) *> read <-> IO.pure(Left(e))
   }
 
   def runAsyncIgnoresErrorInHandler[A](e: Throwable) = {
@@ -55,9 +55,9 @@ trait EffectLaws[F[_]] extends AsyncLaws[F] {
       cb(Right(()))
     }
 
-    val test = F.runAsync(double >> change) { _ => IO.unit }
+    val test = F.runAsync(double *> change) { _ => IO.unit }
 
-    test >> readResult <-> IO.pure(f(a))
+    test *> readResult <-> IO.pure(f(a))
   }
 }
 

diff --git a/laws/shared/src/main/scala/cats/effect/laws/SyncLaws.scala b/laws/shared/src/main/scala/cats/effect/laws/SyncLaws.scala
@@ -49,7 +49,7 @@ trait SyncLaws[F[_]] extends MonadErrorLaws[F, Throwable] {
     val change = F delay { cur = f(cur) }
     val read = F.delay(cur)
 
-    change >> change >> read <-> F.pure(f(f(a)))
+    change *> change *> read <-> F.pure(f(f(a)))
   }
 
   def propagateErrorsThroughBindSuspend[A](t: Throwable) = {

diff --git a/laws/shared/src/main/scala/cats/effect/laws/discipline/AsyncTests.scala b/laws/shared/src/main/scala/cats/effect/laws/discipline/AsyncTests.scala
@@ -21,7 +21,7 @@ package discipline
 
 import cats.data._
 import cats.laws.discipline._
-import cats.laws.discipline.CartesianTests.Isomorphisms
+import cats.laws.discipline.SemigroupalTests.Isomorphisms
 
 import org.scalacheck._, Prop.forAll
 

diff --git a/laws/shared/src/main/scala/cats/effect/laws/discipline/EffectTests.scala b/laws/shared/src/main/scala/cats/effect/laws/discipline/EffectTests.scala
@@ -20,7 +20,7 @@ package laws
 package discipline
 
 import cats.laws.discipline._
-import cats.laws.discipline.CartesianTests.Isomorphisms
+import cats.laws.discipline.SemigroupalTests.Isomorphisms
 
 import org.scalacheck._, Prop.forAll
 

diff --git a/laws/shared/src/main/scala/cats/effect/laws/discipline/SyncTests.scala b/laws/shared/src/main/scala/cats/effect/laws/discipline/SyncTests.scala
@@ -21,7 +21,7 @@ package discipline
 
 import cats.data._
 import cats.laws.discipline._
-import cats.laws.discipline.CartesianTests.Isomorphisms
+import cats.laws.discipline.SemigroupalTests.Isomorphisms
 
 import org.scalacheck._, Prop.forAll
 

diff --git a/laws/shared/src/test/scala/cats/effect/IOTests.scala b/laws/shared/src/test/scala/cats/effect/IOTests.scala
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger
 
 import cats.effect.laws.discipline.EffectTests
 import cats.implicits._
-import cats.kernel.laws.GroupLaws
+import cats.kernel.laws.discipline.MonoidTests
 import cats.laws._
 import cats.laws.discipline._
 import org.scalacheck._
@@ -34,7 +34,7 @@ class IOTests extends BaseTestsSuite {
   import Generators._
 
   checkAllAsync("IO", implicit ec => EffectTests[IO].effect[Int, Int, Int])
-  checkAllAsync("IO", implicit ec => GroupLaws[IO[Int]].monoid)
+  checkAllAsync("IO", implicit ec => MonoidTests[IO[Int]].monoid)
 
   test("defer evaluation until run") {
     var run = false