Skip to content

Commit

Permalink
Merge branch 'main' into update/munit-1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rossabaker authored Jan 24, 2025
2 parents 7ceea1f + 608ccbc commit f877f21
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ eeba69a8b486d3c600cf04ea827e63433b915cea

# Reformat with scalafmt 3.4.3
e841a88fd293d29d70ed643c77de10c5ccb8020c

# Scala Steward: Reformat with scalafmt 3.8.4
c25711f0575b7a4fcd63a6eb595206d1dea8745b
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.2"
version = "3.8.6"

runner.dialect = scala213Source3

Expand Down
4 changes: 2 additions & 2 deletions 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.15"
val Scala213 = "2.13.16"

ThisBuild / crossScalaVersions := Seq("3.3.4", "2.12.20", Scala213)
ThisBuild / tlVersionIntroduced := Map("3" -> "1.2.1")
Expand All @@ -31,7 +31,7 @@ lazy val commonNativeSettings = Seq(
tlVersionIntroduced := commonNativeTlVersionIntroduced
)

val CatsVersion = "2.12.0"
val CatsVersion = "2.13.0"

lazy val root = tlCrossRootProject.aggregate(core, laws, tests, unidocs)

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/mtl/Raise.scala
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ trait Raise[F[_], -E] extends Serializable {

def raise[E2 <: E, A](e: E2): F[A]

def catchNonFatal[E2 <: E, A](a: => A)(f: Throwable => E2)(
implicit A: Applicative[F]): F[A] = {
def catchNonFatal[E2 <: E, A](
a: => A)(f: Throwable => E2)(implicit A: Applicative[F]): F[A] = {
try A.pure(a)
catch {
case NonFatal(ex) => raise(f(ex))
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.11.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ class ReaderTTests extends BaseSuite {
checkAll(
"ReaderT[ReaderT[Option, StringWrapper, *], Int, String].imap",
LocalTests[ReaderT[ReaderT[Option, StringWrapper, *], Int, *], String]
.local[String, String])
.local[String, String]
)
checkAll(
"Local[ReaderT[ReaderT[Option, StringWrapper, *], Int, *], StringWrapper]",
SerializableTests.serializable(
Expand Down

0 comments on commit f877f21

Please sign in to comment.