From fd82c70eb29ee7a9b809277f43a9689fe19147a4 Mon Sep 17 00:00:00 2001 From: Adam Fisher Date: Thu, 3 Nov 2016 12:51:07 +0000 Subject: [PATCH 01/10] Update Scala and sbt versions --- build.sbt | 4 ++-- project/build.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index cd868a1106..16989d5dcd 100644 --- a/build.sbt +++ b/build.sbt @@ -13,8 +13,8 @@ lazy val scoverageSettings = Seq( lazy val buildSettings = Seq( organization := "org.typelevel", - scalaVersion := "2.11.8", - crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC2") + scalaVersion := "2.12.0", + crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0") ) lazy val catsDoctestSettings = Seq( diff --git a/project/build.properties b/project/build.properties index e0d25e8c63..27e88aa115 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13-RC3 +sbt.version=0.13.13 From 9b163940e4a81da2387255496a3508fd27c1179a Mon Sep 17 00:00:00 2001 From: Adam Fisher Date: Thu, 3 Nov 2016 13:02:06 +0000 Subject: [PATCH 02/10] Update some dependencies --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 16989d5dcd..1b2f2d3b7c 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ lazy val commonSettings = Seq( ), libraryDependencies ++= Seq( "com.github.mpilquist" %%% "simulacrum" % "0.10.0", - "org.typelevel" %%% "machinist" % "0.6.0", + "org.typelevel" %%% "machinist" % "0.6.1", compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full), compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.2") ), @@ -96,7 +96,7 @@ lazy val catsSettings = buildSettings ++ commonSettings ++ publishSettings ++ sc lazy val scalaCheckVersion = "1.13.3" lazy val scalaTestVersion = "3.0.0" -lazy val disciplineVersion = "0.7.1" +lazy val disciplineVersion = "0.7.2" lazy val disciplineDependencies = Seq( libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalaCheckVersion, From d8dec6282de33acc2e7fe3ddfb67511421865f75 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Fri, 4 Nov 2016 11:55:43 -0500 Subject: [PATCH 03/10] Update Tut to 0.4.6, sbt-microsites to 0.3.1 --- project/plugins.sbt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9ec6974aad..7aa731dcac 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,5 +9,9 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.4.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") -addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.1") + +// Tut is transitively pulled in by sbt-microsites, but as of 0.3.1 that +// results in the wrong version (0.4.5 instead of 0.4.6). +addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.6") From a90c847493931d4abe012d0a9e42c538eefca187 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Fri, 4 Nov 2016 11:56:13 -0500 Subject: [PATCH 04/10] Update Scalaz for benchmarks --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1b2f2d3b7c..b670a0e581 100644 --- a/build.sbt +++ b/build.sbt @@ -304,7 +304,7 @@ lazy val bench = project.dependsOn(macrosJVM, coreJVM, freeJVM, lawsJVM) .settings(commonJvmSettings) .settings(coverageEnabled := false) .settings(libraryDependencies ++= Seq( - "org.scalaz" %% "scalaz-core" % "7.2.6")) + "org.scalaz" %% "scalaz-core" % "7.2.7")) .enablePlugins(JmhPlugin) // cats-js is JS-only From 17d1091b21ae7fc001d62639810bfcd281b96f95 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Fri, 4 Nov 2016 11:56:35 -0500 Subject: [PATCH 05/10] Update kind-projector --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b670a0e581..29ef344d97 100644 --- a/build.sbt +++ b/build.sbt @@ -43,7 +43,7 @@ lazy val commonSettings = Seq( "com.github.mpilquist" %%% "simulacrum" % "0.10.0", "org.typelevel" %%% "machinist" % "0.6.1", compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full), - compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.2") + compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3") ), fork in test := true, parallelExecution in Test := false, From 11b52c29a676bb75fbf7e44f6a114f392e33c697 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Fri, 4 Nov 2016 11:58:01 -0500 Subject: [PATCH 06/10] Update ScalaCheck --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 29ef344d97..6b422ba67e 100644 --- a/build.sbt +++ b/build.sbt @@ -94,7 +94,7 @@ lazy val includeGeneratedSrc: Setting[_] = { lazy val catsSettings = buildSettings ++ commonSettings ++ publishSettings ++ scoverageSettings ++ javadocSettings -lazy val scalaCheckVersion = "1.13.3" +lazy val scalaCheckVersion = "1.13.4" lazy val scalaTestVersion = "3.0.0" lazy val disciplineVersion = "0.7.2" From b03bec74312e0758090015b9914cd50a01125059 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Sat, 5 Nov 2016 07:51:41 -0500 Subject: [PATCH 07/10] Update Catalysts to 0.0.5 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6b422ba67e..0556dbcbbe 100644 --- a/build.sbt +++ b/build.sbt @@ -103,8 +103,8 @@ lazy val disciplineDependencies = Seq( libraryDependencies += "org.typelevel" %%% "discipline" % disciplineVersion) lazy val testingDependencies = Seq( - libraryDependencies += "org.typelevel" %%% "catalysts-platform" % "0.0.4", - libraryDependencies += "org.typelevel" %%% "catalysts-macros" % "0.0.4" % "test", + libraryDependencies += "org.typelevel" %%% "catalysts-platform" % "0.0.5", + libraryDependencies += "org.typelevel" %%% "catalysts-macros" % "0.0.5" % "test", libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion % "test") From c67159615f6bc533026ab00eff1480058f6a563f Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Mon, 7 Nov 2016 09:39:04 -0600 Subject: [PATCH 08/10] Update sbt-scoverage and work around #201 --- build.sbt | 3 ++- project/plugins.sbt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0556dbcbbe..9c082e5bf6 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,8 @@ lazy val botBuild = settingKey[Boolean]("Build by TravisCI instead of local dev lazy val scoverageSettings = Seq( coverageMinimum := 60, - coverageFailOnMinimum := false + coverageFailOnMinimum := false, + coverageScalacPluginVersion := "1.3.0" ) lazy val buildSettings = Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index 7aa731dcac..92f6105ad3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,5 @@ +resolvers += Resolver.sonatypeRepo("releases") + addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") @@ -5,7 +7,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.4.1") From d971881f231de9bf1f1ff164d4ac55a4727c10a8 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Mon, 7 Nov 2016 16:26:34 -0600 Subject: [PATCH 09/10] Sonatype releases resolver no longer necessary for sbt-scoverage --- project/plugins.sbt | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 92f6105ad3..5d56e632a2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ -resolvers += Resolver.sonatypeRepo("releases") - addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") From 6e4d727a6dacc552a7bc76fcb1275c131bbda3d8 Mon Sep 17 00:00:00 2001 From: Travis Brown Date: Mon, 7 Nov 2016 17:02:05 -0600 Subject: [PATCH 10/10] Update Travis CI config for 2.12.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b91a0411a..eb23806684 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ jdk: matrix: include: - - scala: 2.12.0-RC2 + - scala: 2.12.0 jdk: oraclejdk8 before_install: