From 9aa6983c8fb003d8fc58928a29d7402ca4edd82d Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 16:21:30 +0000 Subject: [PATCH 1/6] Update Cats Version and Other Compatible Shifts --- build.sbt | 4 ++-- project/build.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b078d8d4..143a9994 100644 --- a/build.sbt +++ b/build.sbt @@ -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") + crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.1") ) lazy val commonSettings = Seq( diff --git a/project/build.properties b/project/build.properties index 27e88aa1..c091b86c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=0.13.16 From 0817bdd9f98171257fe8c537ec10c7071d3ecda4 Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 16:28:32 +0000 Subject: [PATCH 2/6] Update Travis Scala Versions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e571fac4..342d51a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: scala scala: - - 2.11.8 + - 2.11.11 - 2.10.6 env: @@ -14,7 +14,7 @@ jdk: matrix: include: - - scala: 2.12.0 + - scala: 2.12.1 jdk: oraclejdk8 env: DEPLOY=true From b1d7d766b7eb99255325d9813d346f47f5e12d3f Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 17:00:01 +0000 Subject: [PATCH 3/6] Update Scala 2.12 and Scala-Js Version --- build.sbt | 7 +++---- project/plugins.sbt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 143a9994..6e28269f 100644 --- a/build.sbt +++ b/build.sbt @@ -12,8 +12,8 @@ lazy val catalystsVersion = "0.0.5" lazy val buildSettings = Seq( organization := "org.typelevel", - scalaVersion := "2.12.1", - crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.1") + scalaVersion := "2.12.3", + crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3") ) lazy val commonSettings = Seq( @@ -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.jsdomnodejs.JSDOMNodeJSEnv, fork := false, parallelExecution in Test := false ) diff --git a/project/plugins.sbt b/project/plugins.sbt index cb608dca..99b5fd90 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 479d84e1cd8425fd85b3673247986b61a0233d84 Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 17:02:40 +0000 Subject: [PATCH 4/6] Fix Travis 2.12 and Gitignore Intellij --- .gitignore | 1 + .travis.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 259c1533..642e8b34 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ TAGS .lib .history .*.swp +.idea/ # Auto-copied by sbt-microsites docs/src/main/tut/contributing.md \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 342d51a3..ba59d4be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ jdk: matrix: include: - - scala: 2.12.1 + - scala: 2.12.3 jdk: oraclejdk8 env: DEPLOY=true From 4b3462c133ecfe83fc787ab47fe5aa4a766be44b Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 17:31:40 +0000 Subject: [PATCH 5/6] Switch from DomNode to NodeJS jsEnv I honestly don't know anything about scalajs so this is a bit like shooting in the dark. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e28269f..7442f366 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +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, - jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv, + jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(), fork := false, parallelExecution in Test := false ) From bc9786a8c5847175c963ce0bf9b9e19af1ce169b Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 19 Sep 2017 18:35:10 +0000 Subject: [PATCH 6/6] Remove Bad Implicits from 2.12 --- laws/src/test/scala/algebra/laws/LawTests.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/laws/src/test/scala/algebra/laws/LawTests.scala b/laws/src/test/scala/algebra/laws/LawTests.scala index f5c759be..a0513502 100644 --- a/laws/src/test/scala/algebra/laws/LawTests.scala +++ b/laws/src/test/scala/algebra/laws/LawTests.scala @@ -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) @@ -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) }