From 191e51f6587e1b623f49660f3b5e6dae2038ed90 Mon Sep 17 00:00:00 2001 From: Daniel Urban Date: Sat, 3 Sep 2016 23:57:23 +0200 Subject: [PATCH] Fix scalacheck dependency error --- build.sbt | 5 +++-- free/src/test/scala/cats/free/FreeTTests.scala | 4 ++-- free/src/test/scala/cats/free/FreeTests.scala | 4 ++-- js/src/test/scala/cats/tests/FutureTests.scala | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 8e25bb3aac..bb916341a7 100644 --- a/build.sbt +++ b/build.sbt @@ -94,7 +94,8 @@ lazy val commonJsSettings = Seq( botBuild := scala.sys.env.get("TRAVIS").isDefined, // batch mode decreases the amount of memory needed to compile scala.js code scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(botBuild.value), - doctestGenTests := Seq.empty + doctestGenTests := Seq.empty, + doctestWithDependencies := false ) lazy val commonJvmSettings = Seq( @@ -248,7 +249,7 @@ lazy val core = crossProject.crossType(CrossType.Pure) .settings(catsSettings:_*) .settings(sourceGenerators in Compile <+= (sourceManaged in Compile).map(Boilerplate.gen)) .settings(includeGeneratedSrc) - .settings(libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalacheckVersion % "test") + .settings(libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalaCheckVersion % "test") .jsSettings(commonJsSettings:_*) .jvmSettings(commonJvmSettings:_*) diff --git a/free/src/test/scala/cats/free/FreeTTests.scala b/free/src/test/scala/cats/free/FreeTTests.scala index ded2dc284c..ee51e17536 100644 --- a/free/src/test/scala/cats/free/FreeTTests.scala +++ b/free/src/test/scala/cats/free/FreeTTests.scala @@ -8,7 +8,7 @@ import cats.laws.discipline._ import cats.tests.CatsSuite import cats.instances.option._ -import org.scalacheck.{Arbitrary, Gen} +import org.scalacheck.{Arbitrary, Gen, Cogen} class FreeTTests extends CatsSuite { @@ -165,7 +165,7 @@ object FreeTTests extends FreeTTestsInstances { def withFlatMapped = for { fDepth <- nextDepth freeDepth <- nextDepth - f <- arbFunction1[A, FreeT[F, G, A]](Arbitrary(freeTGen[F, G, A](fDepth))).arbitrary + f <- arbFunction1[A, FreeT[F, G, A]](Arbitrary(freeTGen[F, G, A](fDepth)), Cogen[Unit].contramap(_ => ())).arbitrary freeFGA <- freeTGen[F, G, A](freeDepth) } yield freeFGA.flatMap(f) diff --git a/free/src/test/scala/cats/free/FreeTests.scala b/free/src/test/scala/cats/free/FreeTests.scala index dcf882a425..e6988f64e8 100644 --- a/free/src/test/scala/cats/free/FreeTests.scala +++ b/free/src/test/scala/cats/free/FreeTests.scala @@ -6,7 +6,7 @@ import cats.arrow.FunctionK import cats.laws.discipline.{CartesianTests, MonadTests, SerializableTests} import cats.laws.discipline.arbitrary.catsLawsArbitraryForFn0 -import org.scalacheck.{Arbitrary, Gen} +import org.scalacheck.{Arbitrary, Gen, Cogen} import Arbitrary.arbFunction1 class FreeTests extends CatsSuite { @@ -131,7 +131,7 @@ sealed trait FreeTestsInstances { def withFlatMapped = for { fDepth <- nextDepth freeDepth <- nextDepth - f <- arbFunction1[A, Free[F, A]](Arbitrary(freeGen[F, A](fDepth))).arbitrary + f <- arbFunction1[A, Free[F, A]](Arbitrary(freeGen[F, A](fDepth)), Cogen[Unit].contramap(_ => ())).arbitrary freeFA <- freeGen[F, A](freeDepth) } yield freeFA.flatMap(f) diff --git a/js/src/test/scala/cats/tests/FutureTests.scala b/js/src/test/scala/cats/tests/FutureTests.scala index f718b3657b..b849e99e7a 100644 --- a/js/src/test/scala/cats/tests/FutureTests.scala +++ b/js/src/test/scala/cats/tests/FutureTests.scala @@ -73,8 +73,8 @@ class FutureTests extends CatsSuite { // ScalaCheck? is something else happening? who knows? // // for now we'll let sleeping dogs lie. - implicit def fakeArbitraryFunction[A: Cogen, B: Arbitrary]: Arbitrary[A => B] = - Arbitrary(arbitrary[B].map(b => (a: A) => b)) + //implicit def fakeArbitraryFunction[A: Cogen, B: Arbitrary]: Arbitrary[A => B] = + // Arbitrary(arbitrary[B].map(b => (a: A) => b)) checkAll("Future[Int]", MonadErrorTests[Future, Throwable].monadError[Int, Int, Int]) checkAll("Future[Int]", ComonadTests[Future].comonad[Int, Int, Int])