Skip to content

Commit

Permalink
Merge branch 'master' into update/zio-2.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
poslegm authored Aug 6, 2024
2 parents 507cfb5 + 7a13b69 commit 0d8d1f6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
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.1"
version = "3.8.3"
runner.dialect = scala3
project.git=true
align.preset = most
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ val scala213 = "2.13.14"
val scala3 = "3.3.3"

lazy val Version = new {
val munit = "0.7.29"
val zio = "2.1.6"
val munit = "1.0.0"
val zio = "2.1.7"
val scalaJavaTime = "2.6.0"
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/munit/ZAssertions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ trait ZAssertions {
obtained: ZIO[R, E, A],
expected: B,
clue: => Any = "values are not the same"
)(implicit loc: Location, ev: B <:< A): ZIO[R, E, Unit] =
)(implicit loc: Location, ev: Compare[A, B]): ZIO[R, E, Unit] =
obtained.map(assertEquals(_, expected, clue))

/** Asserts that `ZIO[R, E, A]` returns NOT the same result as expected
Expand All @@ -91,7 +91,7 @@ trait ZAssertions {
obtained: ZIO[R, E, A],
expected: B,
clue: => Any = "values are not the same"
)(implicit loc: Location, ev: A =:= B): ZIO[R, E, Unit] =
)(implicit loc: Location, ev: Compare[A, B]): ZIO[R, E, Unit] =
obtained.map(assertNotEquals(_, expected, clue))

implicit class InterceptSyntax[R, E <: Throwable](private val body: ZIO[R, E, Any]) {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1

0 comments on commit 0d8d1f6

Please sign in to comment.