merge 1.0 back to master (#2163)

* Setting version to 1.0.0-RC2 * Setting version to 1.0.0-SNAPSHOT * Update deprecations to product{L,R} instead of ap{L,R} (#2121) * Add grouping to scaladoc for arity methods This makes it so when you look at the `Applicative` scaladoc you don't have a bunch of `ap3`, `ap4`, etc noise mixed in with the more meaningful methods. Instead, the generated higher-arity methods show up in separate scaladoc groups below. To see the changes you can pull this branch, run `sbt unidoc` (you may need to clean first), and open `cats/docs/target/scala-2.12/unidoc/cats/Applicative.html` in your browser. * Add doctest examples for Apply (#2086) * Get ready for RC2 (#2044) * Draft release notes * Update * Update * Update * Update * Update * Update Authors * Update * Update * Update * Update * update * Update * Update CHANGES.md * Update AUTHORS.md * Update README.md * Update deprecations to product{L,R} instead of ap{L,R} * Setting version to 1.0.0 * Setting version to 1.0.1-SNAPSHOT * Setting version to 1.0.1 * Setting version to 1.0.2-SNAPSHOT
typelevel · Feb 2, 2018 · ff7bd40 · ff7bd40
1 parent dc6b643
commit ff7bd40
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -22,6 +22,7 @@ For details see [#2131](https://github.com/typelevel/cats/issues/2131)
 
 > 2017 Dec 18
 
+
 ### Breaking changes and migration
 
 * [#2039](https://github.com/typelevel/cats/pull/2039) Remove `Applicative#traverse` and `Applicative#sequence` by @kubukoz

diff --git a/core/src/main/scala/cats/Apply.scala b/core/src/main/scala/cats/Apply.scala
@@ -124,12 +124,12 @@ trait Apply[F[_]] extends Functor[F] with InvariantSemigroupal[F] with ApplyArit
     productL(fa)(fb)
 
   /** Alias for [[productR]]. */
-  @deprecated("Use *> or apR instead.", "1.0.0-RC2")
+  @deprecated("Use *> or productR instead.", "1.0.0-RC2")
   @noop @inline final def followedBy[A, B](fa: F[A])(fb: F[B]): F[B] =
     productR(fa)(fb)
 
   /** Alias for [[productL]]. */
-  @deprecated("Use <* or apL instead.", "1.0.0-RC2")
+  @deprecated("Use <* or productL instead.", "1.0.0-RC2")
   @noop @inline final def forEffect[A, B](fa: F[A])(fb: F[B]): F[A] =
     productL(fa)(fb)
 

diff --git a/core/src/main/scala/cats/FlatMap.scala b/core/src/main/scala/cats/FlatMap.scala
@@ -58,7 +58,7 @@ import simulacrum.noop
    */
   def productREval[A, B](fa: F[A])(fb: Eval[F[B]]): F[B] = flatMap(fa)(_ => fb.value)
 
-  @deprecated("Use apREval instead.", "1.0.0-RC2")
+  @deprecated("Use productREval instead.", "1.0.0-RC2")
   @noop def followedByEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[B] = productREval(fa)(fb)
 
 
@@ -84,7 +84,7 @@ import simulacrum.noop
    */
   def productLEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[A] = flatMap(fa)(a => map(fb.value)(_ => a))
 
-  @deprecated("Use apLEval instead.", "1.0.0-RC2")
+  @deprecated("Use productLEval instead.", "1.0.0-RC2")
   @noop def forEffectEval[A, B](fa: F[A])(fb: Eval[F[B]]): F[A] = productLEval(fa)(fb)
 
   override def ap[A, B](ff: F[A => B])(fa: F[A]): F[B] =

diff --git a/core/src/main/scala/cats/Parallel.scala b/core/src/main/scala/cats/Parallel.scala
@@ -35,7 +35,7 @@ trait NonEmptyParallel[M[_], F[_]] extends Serializable {
   def parProductR[A, B](ma: M[A])(mb: M[B]): M[B] =
     Parallel.parMap2(ma, mb)((_, b) => b)(this)
 
-  @deprecated("Use parApR instead.", "1.0.0-RC2")
+  @deprecated("Use parProductR instead.", "1.0.0-RC2")
   @inline def parFollowedBy[A, B](ma: M[A])(mb: M[B]): M[B] = parProductR(ma)(mb)
 
 
@@ -46,7 +46,7 @@ trait NonEmptyParallel[M[_], F[_]] extends Serializable {
   def parProductL[A, B](ma: M[A])(mb: M[B]): M[A] =
     Parallel.parMap2(ma, mb)((a, _) => a)(this)
 
-  @deprecated("Use parApR instead.", "1.0.0-RC2")
+  @deprecated("Use parProductL instead.", "1.0.0-RC2")
   @inline def parForEffect[A, B](ma: M[A])(mb: M[B]): M[A] = parProductL(ma)(mb)
 
 }

diff --git a/core/src/main/scala/cats/syntax/apply.scala b/core/src/main/scala/cats/syntax/apply.scala
@@ -16,12 +16,12 @@ trait ApplySyntax extends TupleSemigroupalSyntax {
 
 final class ApplyOps[F[_], A](val fa: F[A]) extends AnyVal {
   /** Alias for [[Apply.productR]]. */
-  @deprecated("Use *> or apR instead.", "1.0.0-RC2")
+  @deprecated("Use *> or productR instead.", "1.0.0-RC2")
   @inline def followedBy[B](fb: F[B])(implicit F: Apply[F]): F[B] =
     F.productR(fa)(fb)
 
   /** Alias for [[Apply.productL]]. */
-  @deprecated("Use <* or apL instead.", "1.0.0-RC2")
+  @deprecated("Use <* or productL instead.", "1.0.0-RC2")
   @inline def forEffect[B](fb: F[B])(implicit F: Apply[F]): F[A] =
     F.productL(fa)(fb)
 }
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.0.0-SNAPSHOT"
+version in ThisBuild := "1.0.2-SNAPSHOT"