Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update simulacrum and change bricks to catalysts #643

Merged
merged 1 commit into from
Nov 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ lazy val commonSettings = Seq(
Resolver.sonatypeRepo("snapshots")
),
libraryDependencies ++= Seq(
"com.github.mpilquist" %%% "simulacrum" % "0.4.0",
"com.github.mpilquist" %%% "simulacrum" % "0.5.0",
"org.spire-math" %%% "algebra" % "0.3.1",
"org.spire-math" %%% "algebra-std" % "0.3.1",
"org.typelevel" %%% "machinist" % "0.4.1",
Expand Down Expand Up @@ -135,7 +135,7 @@ lazy val laws = crossProject.crossType(CrossType.Pure)
.settings(disciplineDependencies:_*)
.settings(libraryDependencies ++= Seq(
"org.spire-math" %%% "algebra-laws" % "0.3.1",
"com.github.inthenow" %%% "bricks-platform" % "0.0.1"))
"org.typelevel" %%% "catalysts-platform" % "0.0.2"))
.jsSettings(commonJsSettings:_*)
.jvmSettings(commonJvmSettings:_*)

Expand Down Expand Up @@ -170,7 +170,7 @@ lazy val tests = crossProject.crossType(CrossType.Pure)
.settings(noPublishSettings:_*)
.settings(libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % "3.0.0-M7" % "test",
"com.github.inthenow" %%% "bricks-platform" % "0.0.1" % "test"))
"org.typelevel" %%% "catalysts-platform" % "0.0.2" % "test"))
.jsSettings(commonJsSettings:_*)
.jvmSettings(commonJvmSettings:_*)

Expand Down
2 changes: 1 addition & 1 deletion laws/src/main/scala/cats/laws/SerializableLaws.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package laws
import org.scalacheck.Prop
import org.scalacheck.Prop.{ False, Proof, Result }

import bricks.Platform
import catalysts.Platform

/**
* Check for Java Serializability.
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/scala/cats/tests/CatsSuite.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cats
package tests

import bricks.Platform
import catalysts.Platform

import cats.std.AllInstances
import cats.syntax.{AllSyntax, EqOps}
Expand Down