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.

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

Update scala-library to 2.13.12 #525

Merged
merged 2 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ThisBuild / developers := List(
tlGitHubDev("edmundnoble", "Edmund Noble")
)

val Scala213 = "2.13.11"
val Scala213 = "2.13.12"

ThisBuild / crossScalaVersions := Seq("3.3.1", "2.12.18", Scala213)
ThisBuild / tlVersionIntroduced := Map("3" -> "1.2.1")
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/cats/mtl/Ask.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private[mtl] trait AskForMonadPartialOrder[F[_], G[_], E] extends Ask[G, E] {
val lift: MonadPartialOrder[F, G]
val F: Ask[F, E]

override def applicative = lift.monadG
override def applicative: Applicative[G] = lift.monadG
override def ask[E2 >: E] = lift(F.ask)
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/cats/mtl/Local.scala
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private[mtl] trait LocalInstances extends LowPriorityLocalInstances {
new Local[Kleisli[F, E, *], E] {
def local[A](fa: Kleisli[F, E, A])(f: E => E) = fa.local(f)
val applicative = Applicative[Kleisli[F, E, *]]
def ask[E2 >: E] = Kleisli.ask[F, E2]
def ask[E2 >: E]: Kleisli[F, E2, E2] = Kleisli.ask[F, E2]
}

implicit def localForFunction[E]: Local[E => *, E] =
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/cats/mtl/MonadPartialOrder.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private[mtl] trait MonadPartialOrderInstances {
implicit F: Monad[F]): MonadPartialOrder[F, EitherT[F, E, *]] =
new MonadPartialOrder[F, EitherT[F, E, *]] {
val monadF = F
val monadG = EitherT.catsDataMonadErrorForEitherT[F, E]
val monadG: Monad[EitherT[F, E, *]] = EitherT.catsDataMonadErrorForEitherT[F, E]
def apply[A](fa: F[A]) = EitherT.liftF(fa)
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/cats/mtl/Tell.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private[mtl] trait TellMonadPartialOrder[F[_], G[_], L] extends Tell[G, L] {
val lift: MonadPartialOrder[F, G]
val F: Tell[F, L]

override def functor = lift.monadG
override def functor: Functor[G] = lift.monadG
override def tell(l: L) = lift(F.tell(l))
}

Expand Down
4 changes: 2 additions & 2 deletions tests/shared/src/test/scala/cats/mtl/tests/BaseSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ abstract class BaseSuite extends FunSuite with EqSyntax with DisciplineSuite {
.arbitrary
.map(e =>
new (EitherC[E]#l ~> EitherC[E]#l) {
def apply[A](unused: E Either A) = Left(e)
def apply[A](unused: E Either A): Either[E, A] = Left(e)
})
} yield res)
}
Expand All @@ -135,7 +135,7 @@ abstract class BaseSuite extends FunSuite with EqSyntax with DisciplineSuite {
Arbitrary {
Arbitrary.arbBool.arbitrary.map { no =>
if (no) new (Option ~> Option) {
def apply[A](o: Option[A]) = None
def apply[A](o: Option[A]): Option[A] = None
}
else FunctionK.id[Option]
}
Expand Down