Skip to content

Commit f3b9384

Browse files
committed
More checkpointing
1 parent fe49b37 commit f3b9384

File tree

4 files changed

+32
-15
lines changed

4 files changed

+32
-15
lines changed

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ lazy val core = crossProject
167167
lazy val coreJVM = core.jvm.settings(mimaSettings)
168168
lazy val coreJS = core.js
169169

170+
lazy val dottyThing = project
171+
.dependsOn(coreJVM)
172+
170173
enablePlugins(GitVersioning)
171174

172175
git.baseVersion := BaseVersion

core/src/test/scala/shims/MonadConversionSpecs.scala

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
package shims
1818

19-
import cats.laws.discipline._
20-
import scalaz.std.option._
21-
import scalaz.std.tuple._
22-
import scalaz.std.anyVal._
19+
// import cats.laws.discipline._
20+
// import scalaz.std.option._
21+
// import scalaz.std.tuple._
22+
// import scalaz.std.anyVal._
2323

24-
import org.scalacheck._
24+
// import org.scalacheck._
2525
import org.specs2.mutable._
2626
import org.typelevel.discipline.specs2.mutable.Discipline
2727

2828
object MonadConversionSpecs extends Specification with Discipline {
29-
import Arbitrary.arbitrary
29+
// import Arbitrary.arbitrary
3030

31-
"ifunctor" >> {
31+
/*"ifunctor" >> {
3232
cats.functor.Invariant[Option]
3333
scalaz.InvariantFunctor[Option]
3434
@@ -160,22 +160,22 @@ object MonadConversionSpecs extends Specification with Discipline {
160160
161161
"scalaz -> cats" >>
162162
checkAll("NonEmptyList", ComonadTests[NEL].comonad[Int, Int, Int])
163-
}
163+
}*/
164164

165165
"monad" >> {
166166
"scalaz -> cats" >> {
167-
"Option" >> {
167+
/*"Option" >> {
168168
cats.Monad[Option]
169169
scalaz.Monad[Option]
170170
171171
checkAll("Option", MonadTests[Option].monad[Int, Int, Int])
172-
}
172+
}*/
173173

174174
"Free[Function0, ?]" >> {
175175
import cats.kernel.Eq
176176
import cats.instances.list._
177177

178-
import scalaz.{~>, Free}
178+
/*import scalaz.{~>, Free}
179179
180180
case class Foo[A](a: A)
181181
@@ -196,15 +196,16 @@ object MonadConversionSpecs extends Specification with Discipline {
196196
3 -> genBind)
197197
198198
Arbitrary(g)
199-
}
199+
}*/
200200

201201
{
202202
implicit val eqStr: Eq[String] = null
203203

204+
Eq[String]
204205
Eq[List[String]]
205206
}
206207

207-
implicit def eqFree[A: Eq]: Eq[Free[Foo, A]] = {
208+
/*implicit def eqFree[A: Eq]: Eq[Free[Foo, A]] = {
208209
Eq instance { (f1, f2) =>
209210
val nt = λ[Foo ~> List](fa => List(fa.a))
210211
@@ -218,7 +219,9 @@ object MonadConversionSpecs extends Specification with Discipline {
218219
cats.Monad[Free[Foo, ?]]
219220
scalaz.Monad[Free[Foo, ?]]
220221
221-
checkAll("Free[Foo, ?]", MonadTests[Free[Foo, ?]].monad[Int, Int, Int])
222+
checkAll("Free[Foo, ?]", MonadTests[Free[Foo, ?]].monad[Int, Int, Int])*/
223+
224+
ok
222225
}
223226
}
224227
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package shims
2+
3+
import cats.kernel.Eq
4+
import cats.instances.list._
5+
6+
object Test {
7+
implicit val eqStr: Eq[String] = null
8+
9+
Eq[String]
10+
Eq[List[String]]
11+
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.16

0 commit comments

Comments
 (0)