Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Update Cats Version and Other Compatible Shifts #204

Merged
merged 6 commits into from
Oct 4, 2017
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TAGS
.lib
.history
.*.swp
.idea/

# Auto-copied by sbt-microsites
docs/src/main/tut/contributing.md
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: false
language: scala

scala:
- 2.11.8
- 2.11.11
- 2.10.6

env:
Expand All @@ -14,7 +14,7 @@ jdk:

matrix:
include:
- scala: 2.12.0
- scala: 2.12.3
jdk: oraclejdk8
env: DEPLOY=true

Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
lazy val scalaCheckVersion = "1.13.4"
lazy val scalaTestVersion = "3.0.1"
lazy val disciplineVersion = "0.7.2"
lazy val catsVersion = "0.9.0"
lazy val catsVersion = "1.0.0-MF"
lazy val catalystsVersion = "0.0.5"

lazy val buildSettings = Seq(
organization := "org.typelevel",
scalaVersion := "2.12.1",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
scalaVersion := "2.12.3",
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3")
)

lazy val commonSettings = Seq(
Expand All @@ -40,8 +40,7 @@ lazy val commonSettings = Seq(
scalacOptions in (Compile, console) ~= (_ filterNot (_ == "-Ywarn-unused-import")),
scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value,
scalaJSStage in Global := FastOptStage,
requiresDOM := false,
jsEnv := NodeJSEnv().value,
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
fork := false,
parallelExecution in Test := false
)
Expand Down
2 changes: 0 additions & 2 deletions laws/src/test/scala/algebra/laws/LawTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ class LawTests extends FunSuite with Configuration with Discipline {
laws[GroupLaws, String].check(_.monoid)

{
implicit val g: Group[Int] = AdditiveGroup.additive[Int]
laws[OrderLaws, Option[HasEq[Int]]].check(_.eqv)
laws[OrderLaws, Option[HasPartialOrder[Int]]].check(_.partialOrder)
laws[OrderLaws, Option[Int]].check(_.order)
Expand Down Expand Up @@ -147,7 +146,6 @@ class LawTests extends FunSuite with Configuration with Discipline {
laws[LatticeLaws, Int].check(_.boundedDistributiveLattice)

{
implicit val comrig: CommutativeRig[Int] = IntMinMaxLattice.asCommutativeRig
laws[RingLaws, Int].check(_.commutativeRig)
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.18")