Merge pull request #938 from paulp/2.11.8

Onward to scala 2.11.8.

.travis.yml

@@ -5,7 +5,7 @@ git:
 
 scala:
 - 2.10.6
-- 2.11.7
+- 2.11.8
 
 script:
   - scripts/travis-publish.sh

bench/src/main/scala/cats/bench/TrampolineBench.scala

@@ -6,8 +6,6 @@ import cats._
 import cats.implicits._
 import cats.free.Trampoline
 
-import scala.util.control.TailCalls
-
 @State(Scope.Benchmark)
 class TrampolineBench {
 

build.sbt

@@ -14,8 +14,8 @@ lazy val scoverageSettings = Seq(
 
 lazy val buildSettings = Seq(
   organization := "org.typelevel",
-  scalaVersion := "2.11.7",
-  crossScalaVersions := Seq("2.10.6", "2.11.7")
+  scalaVersion := "2.11.8",
+  crossScalaVersions := Seq("2.10.6", "2.11.8")
 )
 
 lazy val catsDoctestSettings = Seq(
@@ -34,7 +34,7 @@ lazy val commonSettings = Seq(
     "org.spire-math" %%% "algebra" % "0.3.1",
     "org.spire-math" %%% "algebra-std" % "0.3.1",
     "org.typelevel" %%% "machinist" % "0.4.1",
-    compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0-M5" cross CrossVersion.full),
+    compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full),
     compilerPlugin("org.spire-math" %% "kind-projector" % "0.6.3")
   ),
   parallelExecution in Test := false,
@@ -280,7 +280,7 @@ addCommandAlias("validateJS", ";macrosJS/compile;coreJS/compile;lawsJS/compile;t
 addCommandAlias("validate", ";validateJS;validateJVM")
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-// Base Build Settings - Should not need to edit below this line. 
+// Base Build Settings - Should not need to edit below this line.
 // These settings could also come from another file or a plugin.
 // The only issue if coming from a plugin is that the Macro lib versions
 // are hard coded, so an overided facility would be required.
@@ -352,7 +352,7 @@ lazy val sharedPublishSettings = Seq(
       Some("Releases" at nexus + "service/local/staging/deploy/maven2")
   }
 )
- 
+
 lazy val sharedReleaseProcess = Seq(
   releaseProcess := Seq[ReleaseStep](
     checkSnapshotDependencies,

core/src/main/scala/cats/MonadError.scala

@@ -1,7 +1,5 @@
 package cats
 
-import cats.data.{Xor, XorT}
-
 /**
  * A monad that also allows you to raise and or handle an error value.
  *

core/src/main/scala/cats/SemigroupK.scala

@@ -1,6 +1,6 @@
 package cats
 
-import simulacrum.{op, typeclass}
+import simulacrum.typeclass
 
 /**
  * SemigroupK is a universal semigroup which operates on kinds.
@@ -25,7 +25,7 @@ import simulacrum.{op, typeclass}
   /**
    * Combine two F[A] values.
    */
-  @op("<+>", alias=true)
+  @simulacrum.op("<+>", alias=true)
   def combineK[A](x: F[A], y: F[A]): F[A]
 
   /**

core/src/main/scala/cats/data/Xor.scala

@@ -1,8 +1,6 @@
 package cats
 package data
 
-import cats.functor.Bifunctor
-
 import scala.reflect.ClassTag
 import scala.util.{Failure, Success, Try}
 

core/src/main/scala/cats/std/future.scala

@@ -6,7 +6,6 @@ import cats.data.Xor
 
 import scala.util.control.NonFatal
 import scala.concurrent.{ExecutionContext, Future}
-import scala.concurrent.duration.FiniteDuration
 
 trait FutureInstances extends FutureInstances1 {
 

js/src/test/scala/cats/tests/FutureTests.scala

@@ -6,17 +6,23 @@ import cats.data.Xor
 import cats.laws.discipline._
 import cats.laws.discipline.eq.tuple3Eq
 import cats.js.std.Await
-import cats.js.std.future.{futureEq, futureComonad}
+import cats.js.std.future.futureComonad
 import cats.tests.CatsSuite
 
-import scala.concurrent.{ExecutionContext, Future}
+import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
-
 import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
 
+// https://issues.scala-lang.org/browse/SI-7934
+@deprecated("", "")
+class DeprecatedForwarder {
+  implicit def runNow = scala.scalajs.concurrent.JSExecutionContext.Implicits.runNow
+}
+object DeprecatedForwarder extends DeprecatedForwarder
+import DeprecatedForwarder.runNow
+
 class FutureTests extends CatsSuite {
   val timeout = 3.seconds
 

jvm/src/test/scala/cats/tests/FutureTests.scala

@@ -5,10 +5,10 @@ package tests
 import cats.data.Xor
 import cats.laws.discipline._
 import cats.laws.discipline.eq.tuple3Eq
-import cats.jvm.std.future.{futureEq, futureComonad}
+import cats.jvm.std.future.futureComonad
 import cats.tests.CatsSuite
 
-import scala.concurrent.{Await, ExecutionContext, Future}
+import scala.concurrent.{Await, Future}
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext.Implicits.global
 

laws/src/main/scala/cats/laws/SerializableLaws.scala

@@ -2,7 +2,7 @@ package cats
 package laws
 
 import org.scalacheck.Prop
-import org.scalacheck.Prop.{ Exception, False, Proof, Result }
+import org.scalacheck.Prop.{ Exception, Proof, Result }
 
 import catalysts.Platform
 

laws/src/main/scala/cats/laws/TraverseLaws.scala

@@ -2,7 +2,6 @@ package cats
 package laws
 
 import cats.Id
-import cats.arrow.Compose
 import cats.data.Const
 import cats.syntax.traverse._
 import cats.syntax.foldable._

laws/src/main/scala/cats/laws/discipline/ApplicativeErrorTests.scala

@@ -5,7 +5,6 @@ package discipline
 import cats.data.{ Xor, XorT }
 import cats.laws.discipline.CartesianTests.Isomorphisms
 import cats.laws.discipline.arbitrary._
-import cats.laws.discipline.eq.unitEq
 import org.scalacheck.{Arbitrary, Prop}
 import org.scalacheck.Prop.forAll
 

laws/src/main/scala/cats/laws/discipline/MonadErrorTests.scala

@@ -4,7 +4,6 @@ package discipline
 
 import cats.data.{ Xor, XorT }
 import cats.laws.discipline.CartesianTests.Isomorphisms
-import cats.laws.discipline.eq.unitEq
 import org.scalacheck.{Arbitrary, Prop}
 import org.scalacheck.Prop.forAll
 

laws/src/main/scala/cats/laws/discipline/MonadStateTests.scala

@@ -3,7 +3,6 @@ package laws
 package discipline
 
 import cats.laws.discipline.CartesianTests.Isomorphisms
-import eq.unitEq
 import org.scalacheck.{Arbitrary, Prop}
 import org.scalacheck.Prop.forAll
 

project/plugins.sbt

@@ -1,13 +1,13 @@
-addSbtPlugin("com.eed3si9n"        % "sbt-unidoc"             % "0.3.2")
-addSbtPlugin("com.github.gseitz"   % "sbt-release"            % "1.0.0")
-addSbtPlugin("com.jsuereth"        % "sbt-pgp"                % "1.0.0")
-addSbtPlugin("com.typesafe.sbt"    % "sbt-ghpages"            % "0.5.3")
-addSbtPlugin("com.typesafe.sbt"    % "sbt-site"               % "0.8.1")
-addSbtPlugin("org.tpolecat"        % "tut-plugin"             % "0.4.0")
-addSbtPlugin("pl.project13.scala"  % "sbt-jmh"                % "0.2.3")
+addSbtPlugin("com.eed3si9n"         % "sbt-unidoc"            % "0.3.2")
+addSbtPlugin("com.github.gseitz"    % "sbt-release"           % "1.0.0")
+addSbtPlugin("com.jsuereth"         % "sbt-pgp"               % "1.0.0")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-ghpages"           % "0.5.3")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-site"              % "0.8.1")
+addSbtPlugin("org.tpolecat"         % "tut-plugin"            % "0.4.0")
+addSbtPlugin("pl.project13.scala"   % "sbt-jmh"               % "0.2.3")
 addSbtPlugin("org.scalastyle"      %% "scalastyle-sbt-plugin" % "0.8.0")
-addSbtPlugin("org.scoverage"       % "sbt-scoverage"          % "1.2.0")
-addSbtPlugin("com.typesafe.sbt"    % "sbt-git"                % "0.8.4")
-addSbtPlugin("org.scala-js"        % "sbt-scalajs"            % "0.6.5")
-addSbtPlugin("com.github.tkawachi" % "sbt-doctest"            % "0.3.5")
-addSbtPlugin("org.xerial.sbt"      % "sbt-sonatype"           % "1.1")
+addSbtPlugin("org.scoverage"        % "sbt-scoverage"         % "1.2.0")
+addSbtPlugin("com.typesafe.sbt"     % "sbt-git"               % "0.8.4")
+addSbtPlugin("org.scala-js"         % "sbt-scalajs"           % "0.6.7")
+addSbtPlugin("com.github.tkawachi"  % "sbt-doctest"           % "0.3.5")
+addSbtPlugin("org.xerial.sbt"       % "sbt-sonatype"          %  "1.1")

scripts/travis-publish.sh

@@ -20,7 +20,7 @@ export publish_cmd="publishLocal"
 if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" && $(cat version.sbt) =~ "-SNAPSHOT" ]]; then
   export publish_cmd="publish gitSnapshots publish"
   # temporarily disable to stabilize travis
-  #if [[ $TRAVIS_SCALA_VERSION = "2.11.7" ]]; then
+  #if [[ $TRAVIS_SCALA_VERSION = "2.11.8" ]]; then
   #  export publish_cmd="$publish_cmd ghpagesPushSite"
   #fi
 fi

tests/src/test/scala/cats/tests/CatsSuite.scala

@@ -7,7 +7,7 @@ import cats.std.AllInstances
 import cats.syntax.{AllSyntax, EqOps}
 
 import org.scalactic.anyvals.{PosZDouble, PosInt}
-import org.scalatest.{FunSuite, PropSpec, Matchers}
+import org.scalatest.{FunSuite, Matchers}
 import org.scalatest.prop.{Configuration, GeneratorDrivenPropertyChecks}
 import org.typelevel.discipline.scalatest.Discipline
 

tests/src/test/scala/cats/tests/ComposeTests.scala

@@ -1,9 +1,8 @@
 package cats
 package tests
 
-import cats.data.{ NonEmptyList, NonEmptyVector, OneAnd }
+import cats.data.{ NonEmptyList, NonEmptyVector }
 import cats.laws.discipline.{ AlternativeTests, ApplicativeTests, FoldableTests, CartesianTests, MonoidKTests, SemigroupKTests, arbitrary, eq }, arbitrary._, eq._
-import org.scalacheck.Arbitrary
 
 class ComposeTests extends CatsSuite {
   // we have a lot of generated lists of lists in these tests. We have to tell

tests/src/test/scala/cats/tests/CoyonedaTests.scala

@@ -5,8 +5,7 @@ import cats.arrow.NaturalTransformation
 import cats.free.Coyoneda
 import cats.laws.discipline.{FunctorTests, SerializableTests}
 
-import org.scalacheck.{Arbitrary, Gen}
-import org.scalacheck.Arbitrary.arbitrary
+import org.scalacheck.Arbitrary
 
 class CoyonedaTests extends CatsSuite {
   implicit def coyonedaArbitrary[F[_] : Functor, A : Arbitrary](implicit F: Arbitrary[F[A]]): Arbitrary[Coyoneda[F, A]] =

tests/src/test/scala/cats/tests/FoldableTests.scala

@@ -2,8 +2,7 @@ package cats
 package tests
 
 import org.scalatest.prop.PropertyChecks
-import org.scalacheck.{Arbitrary, Gen}
-import org.scalacheck.Arbitrary.arbitrary
+import org.scalacheck.Arbitrary
 
 import cats.std.all._
 

tests/src/test/scala/cats/tests/FreeApplicativeTests.scala

@@ -5,7 +5,7 @@ import cats.arrow.NaturalTransformation
 import cats.free.FreeApplicative
 import cats.laws.discipline.{CartesianTests, ApplicativeTests, SerializableTests}
 import cats.laws.discipline.eq.{tuple3Eq, tuple2Eq}
-import cats.data.{Const, State}
+import cats.data.State
 
 import org.scalacheck.{Arbitrary, Gen}
 

tests/src/test/scala/cats/tests/FreeTests.scala

@@ -7,7 +7,7 @@ import cats.laws.discipline.{CartesianTests, MonadTests, SerializableTests}
 import cats.laws.discipline.eq._
 import cats.laws.discipline.arbitrary.function0Arbitrary
 import org.scalacheck.{Arbitrary, Gen}
-import Arbitrary.{arbitrary, arbFunction1}
+import Arbitrary.arbFunction1
 
 class FreeTests extends CatsSuite {
   import FreeTests._

tests/src/test/scala/cats/tests/FuncTests.scala

@@ -1,8 +1,8 @@
 package cats
 package tests
 
-import cats.data.{ Func, AppFunc, Const }
-import Func.{ appFunc, appFuncU }
+import cats.data.{ Func, AppFunc }
+import Func.appFunc
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 import org.scalacheck.Arbitrary

tests/src/test/scala/cats/tests/FunctionTests.scala

@@ -1,8 +1,6 @@
 package cats
 package tests
 
-import org.scalacheck.Arbitrary
-
 import cats.arrow.{Arrow, Choice}
 import cats.functor.Contravariant
 import cats.laws.discipline._

tests/src/test/scala/cats/tests/IdTests.scala

@@ -1,7 +1,6 @@
 package cats
 package tests
 
-import org.scalacheck.Prop.forAll
 import cats.laws.discipline._
 import cats.laws.discipline.eq.tuple3Eq
 

tests/src/test/scala/cats/tests/InjectTests.scala

@@ -3,7 +3,6 @@ package tests
 
 import cats.data.{Xor, Coproduct}
 import cats.free.{Free, Inject,:<:}
-import cats.laws.discipline.arbitrary
 import org.scalacheck._
 
 class InjectTests extends CatsSuite {

tests/src/test/scala/cats/tests/IorTests.scala

@@ -5,7 +5,6 @@ import cats.data.{Xor, Ior}
 import cats.laws.discipline.{BifunctorTests, TraverseTests, MonadTests, SerializableTests, CartesianTests}
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
-import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary._
 
 class IorTests extends CatsSuite {

tests/src/test/scala/cats/tests/ListWrapper.scala

@@ -1,9 +1,7 @@
 package cats
 package tests
 
-import cats.data.OneAnd
 import cats.std.list._
-import cats.laws.discipline.arbitrary.oneAndArbitrary
 
 import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary

tests/src/test/scala/cats/tests/OneAndTests.scala

@@ -5,11 +5,9 @@ import algebra.laws.{GroupLaws, OrderLaws}
 
 import cats.data.{NonEmptyList, OneAnd}
 import cats.laws.discipline.{ComonadTests, FunctorTests, SemigroupKTests, FoldableTests, MonadTests, SerializableTests, CartesianTests, TraverseTests, ReducibleTests}
-import cats.laws.discipline.arbitrary.{evalArbitrary, oneAndArbitrary}
+import cats.laws.discipline.arbitrary.oneAndArbitrary
 import cats.laws.discipline.eq._
 
-import scala.util.Random
-
 class OneAndTests extends CatsSuite {
   checkAll("OneAnd[List, Int]", OrderLaws[OneAnd[List, Int]].eqv)
 

tests/src/test/scala/cats/tests/OptionTTests.scala

@@ -1,11 +1,10 @@
 package cats.tests
 
-import cats.{Applicative, Id, Monad, Cartesian, Show}
-import cats.data.{OptionT, Validated, Xor}
-import cats.laws.discipline.{ApplicativeTests, FunctorTests, MonadCombineTests, SerializableTests, CartesianTests, MonadTests}
+import cats.{Id, Monad, Cartesian, Show}
+import cats.data.{OptionT, Xor}
+import cats.laws.discipline.{FunctorTests, SerializableTests, CartesianTests, MonadTests}
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
-import org.scalacheck.{Arbitrary, Gen}
 
 class OptionTTests extends CatsSuite {
 

tests/src/test/scala/cats/tests/ProdTests.scala

@@ -5,7 +5,6 @@ import cats.data.Prod
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
-import org.scalacheck.Arbitrary
 
 class ProdTests extends CatsSuite {
   implicit val iso = CartesianTests.Isomorphisms.invariant[Prod[Option, List, ?]]

tests/src/test/scala/cats/tests/StateTTests.scala

@@ -1,11 +1,11 @@
 package cats
 package tests
 
-import cats.laws.discipline.{CartesianTests, MonadStateTests, MonoidKTests, SerializableTests}
+import cats.laws.discipline.{CartesianTests, MonadStateTests, SerializableTests}
 import cats.data.{State, StateT}
 import cats.laws.discipline.eq._
 import cats.laws.discipline.arbitrary._
-import org.scalacheck.{Arbitrary, Gen}
+import org.scalacheck.Arbitrary
 
 class StateTTests extends CatsSuite {
   import StateTTests._

tests/src/test/scala/cats/tests/SyntaxTests.scala

@@ -3,13 +3,7 @@ package tests
 
 import cats.std.AllInstances
 import cats.syntax.AllSyntax
-import algebra.laws.GroupLaws
 import cats.functor.{Invariant, Contravariant}
-import cats.laws.discipline.SerializableTests
-
-import org.scalacheck.{Arbitrary}
-import org.scalatest.prop.PropertyChecks
-import scala.reflect.runtime.universe.TypeTag
 
 /**
  * Test that our syntax implicits are working.

tests/src/test/scala/cats/tests/ValidatedTests.scala

@@ -4,7 +4,6 @@ package tests
 import cats.data.{NonEmptyList, Validated, ValidatedNel, Xor, XorT}
 import cats.data.Validated.{Valid, Invalid}
 import cats.laws.discipline.{BifunctorTests, TraverseTests, ApplicativeErrorTests, SerializableTests, CartesianTests}
-import org.scalacheck.{Gen, Arbitrary}
 import org.scalacheck.Arbitrary._
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq.tuple3Eq