Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 1.0 back to master #2163

Merged
merged 8 commits into from
Feb 2, 2018
Merged

merge 1.0 back to master #2163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38b9f91
Setting version to 1.0.0-RC2
kailuowang Dec 19, 2017
b702ddc
Setting version to 1.0.0-SNAPSHOT
kailuowang Dec 19, 2017
d421663
Update deprecations to product{L,R} instead of ap{L,R} (#2121)
rossabaker Dec 19, 2017
0ba7021
Setting version to 1.0.0
kailuowang Dec 26, 2017
eac5be2
Setting version to 1.0.1-SNAPSHOT
kailuowang Dec 26, 2017
6edb9c7
Setting version to 1.0.1
kailuowang Dec 31, 2017
ce34c4e
Setting version to 1.0.2-SNAPSHOT
kailuowang Dec 31, 2017
411278a
Merge branch 'master' into 1.0
kailuowang Feb 1, 2018
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 CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/Apply.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/FlatMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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] =
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/Parallel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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)

}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/syntax/apply.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.0.0-SNAPSHOT"
version in ThisBuild := "1.0.2-SNAPSHOT"