Skip to content

Commit 52d526e

Browse files
committed
Upgrade to ZIO 2.0.0-RC6
1 parent 09f39e6 commit 52d526e

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

project/BuildHelper.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ object BuildHelper {
2626
val Scala213: String = versions("2.13")
2727
val ScalaDotty: String = "3.1.0" //versions.getOrElse("3.0", versions("3.1"))
2828

29-
val zioVersion = "2.0.0-RC5"
30-
val zioJsonVersion = "0.3.0-RC7"
31-
val zioPreludeVersion = "1.0.0-RC13"
32-
val zioOpticsVersion = "2.0.0-RC4"
29+
val zioVersion = "2.0.0-RC6"
30+
val zioJsonVersion = "0.3.0-RC8"
31+
val zioPreludeVersion = "1.0.0-RC14"
32+
val zioOpticsVersion = "0.2.0-RC4"
3333
val silencerVersion = "1.7.8"
3434

3535
private val testDeps = Seq(

zio-schema-derivation/shared/src/test/scala-2/zio/schema/DeriveSchemaSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ object DeriveSchemaSpec extends ZIOSpecDefault {
229229

230230
}
231231

232-
override def spec: ZSpec[Environment, Any] = suite("DeriveSchemaSpec")(
232+
override def spec: Spec[Environment, Any] = suite("DeriveSchemaSpec")(
233233
suite("Derivation")(
234234
test("correctly derives case class") {
235235
assert(Schema[User].toString)(not(containsString("null")) && not(equalTo("$Lazy$")))

zio-schema-zio-test/shared/src/test/scala/zio/schema/DeriveGenSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import zio.test.Assertion._
66
import zio.test._
77

88
object DeriveGenSpec extends ZIOSpecDefault {
9-
override def spec: ZSpec[Environment, Any] = suite("DeriveGenSpec")(
9+
override def spec: Spec[Environment, Any] = suite("DeriveGenSpec")(
1010
test("correctly derives Primitives") {
1111
for {
1212
unit <- generateValue(DeriveGen.gen(unitSchema))
@@ -75,5 +75,5 @@ object DeriveGenSpec extends ZIOSpecDefault {
7575
)
7676

7777
private def generateValue[R, A](gen: Gen[R, A]): ZIO[R, Nothing, TestResult] =
78-
assertM(gen.runCollect)(isNonEmpty)
78+
assertZIO(gen.runCollect)(isNonEmpty)
7979
}

zio-schema/shared/src/test/scala/zio/schema/SchemaAssertions.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ package zio.schema
33
import zio.Chunk
44
import zio.schema.syntax._
55
import zio.test.Assertion
6-
import zio.test.AssertionM.Render.param
76

87
object SchemaAssertions {
98

109
def migratesTo[A: Schema, B: Schema](expected: B): Assertion[A] =
11-
Assertion.assertion("migratesTo")(param(expected)) { value =>
10+
Assertion.assertion("migratesTo") { value =>
1211
value.migrate[B] match {
1312
case Left(_) => false
1413
case Right(m) if m != expected => false
@@ -18,22 +17,22 @@ object SchemaAssertions {
1817
}
1918

2019
def cannotMigrateValue[A: Schema, B: Schema]: Assertion[A] =
21-
Assertion.assertion("cannotMigrateTo")() { value =>
20+
Assertion.assertion("cannotMigrateTo") { value =>
2221
value.migrate[B].isLeft
2322
}
2423

2524
def hasSameSchema(expected: Schema[_]): Assertion[Schema[_]] =
26-
Assertion.assertion("hasSameSchema")(param(expected))(
25+
Assertion.assertion("hasSameSchema")(
2726
actual => Schema.strictEquality.equal(expected, actual)
2827
)
2928

3029
def hasSameSchemaStructure(expected: Schema[_]): Assertion[Schema[_]] =
31-
Assertion.assertion("hasSameSchemaStructure")(param(expected))(
30+
Assertion.assertion("hasSameSchemaStructure")(
3231
actual => Schema.structureEquality.equal(expected, actual)
3332
)
3433

3534
def hasSameAst(expected: Schema[_]): Assertion[Schema[_]] =
36-
Assertion.assertion("hasSameAst")(param(expected))(actual => equalsAst(expected, actual))
35+
Assertion.assertion("hasSameAst")(actual => equalsAst(expected, actual))
3736

3837
private def equalsAst(expected: Schema[_], actual: Schema[_], depth: Int = 0): Boolean = (expected, actual) match {
3938
case (Schema.Primitive(StandardType.DurationType, _), Schema.Primitive(StandardType.DurationType, _)) => true

0 commit comments

Comments
 (0)