Skip to content

Support ZIO 2.x #149

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

Merged
merged 21 commits into from
Jan 10, 2022
Merged

Support ZIO 2.x #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bce5505
Run scalafix ZIO 2 migration
alexvanolst Nov 10, 2021
27dde00
Get core project compiling
alexvanolst Nov 10, 2021
baf1316
Get Optics to compile and pass tests
alexvanolst Nov 10, 2021
6a38376
Get protobuf to compile and pass tests
alexvanolst Nov 10, 2021
43bfd6e
Run `sbt prepare`
alexvanolst Nov 10, 2021
d352e54
Remove unused reference to zio-nio in BuildHelper.scala
alexvanolst Nov 15, 2021
6ff1d1f
Merge branch 'main' into zio2
alexvanolst Nov 15, 2021
eb1b5a3
Merge branch 'main' into zio2
alexvanolst Nov 24, 2021
af2ee7c
Merge branch 'main' into zio2
alexvanolst Nov 24, 2021
6981e4a
Merge branch 'main' into zio2
alexvanolst Dec 13, 2021
193720a
Merge branch 'main' into zio2
alexvanolst Dec 18, 2021
bf6c2d4
Update to ZIO 2.0.0-RC1
alexvanolst Dec 18, 2021
0ef1e00
Update zio-schema-json and examples to ZIO 2
alexvanolst Dec 18, 2021
37fd80b
Update dependency ch.epfl.scala:sbt-scalafix to v0.9.33 (#98)
renovate[bot] Dec 19, 2021
45a292e
Capture annotations on Enums and all cases (#167)
thinkharderdev Dec 19, 2021
134d4ee
Update dependency com.github.ghik:silencer-lib to v1.7.7 (#123)
renovate[bot] Dec 19, 2021
d45db45
Merge branch 'main' into zio2
alexvanolst Dec 20, 2021
2195de0
Upgrade zio-json to 0.3.0-RC1-1
alexvanolst Dec 22, 2021
69e4688
Update zio-prelude and zio-optics versions to ZIO-2 releases and addr…
alexvanolst Dec 23, 2021
1f26922
Last bit of PR cleanup
alexvanolst Dec 23, 2021
9ebeb8e
Fix linter error
alexvanolst Dec 23, 2021
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
10 changes: 5 additions & 5 deletions project/BuildHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ object BuildHelper {
val Scala213: String = versions("2.13")
val ScalaDotty: String = "3.1.0" //versions.getOrElse("3.0", versions("3.1"))

val zioVersion = "1.0.12"
val zioJsonVersion = "0.2.0-M2"
val zioPreludeVersion = "1.0.0-RC7"
val zioOpticsVersion = "0.1.0"
val silencerVersion = "1.7.6"
val zioVersion = "2.0.0-RC1"
val zioJsonVersion = "0.3.0-RC1-1"
val zioPreludeVersion = "1.0.0-RC9"
val zioOpticsVersion = "0.2.0-RC1"
val silencerVersion = "1.7.7"

private val testDeps = Seq(
"dev.zio" %% "zio-test" % zioVersion % "test",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.32")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.10")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
Expand Down
14 changes: 7 additions & 7 deletions tests/shared/src/test/scala/zio/schema/AccessorBuilderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
test("fail") {
assert(Schema.fail("error").makeAccessors(builder).asInstanceOf[Unit])(isUnit)
},
testM("primitive") {
test("primitive") {
check(SchemaGen.anyPrimitive) { schema =>
assert(schema.makeAccessors(builder))(isUnit)
}
},
testM("sequence") {
test("sequence") {
check(SchemaGen.anySchema) { elementSchema =>
val collectionSchema = elementSchema.repeated
val traversal = collectionSchema.makeAccessors(builder)
Expand All @@ -33,7 +33,7 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
)(isTrue)
}
},
testM("transform") {
test("transform") {
check(SchemaGen.anyPrimitive) { schema =>
val transform = schema.transformOrFail[Unit](_ => Left("error"), _ => Left("error"))

Expand All @@ -45,7 +45,7 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
)(isTrue)
}
},
testM("optional") {
test("optional") {
check(SchemaGen.anyPrimitive) { schema =>
val optionalSchema: Schema.Optional[_] = schema.optional.asInstanceOf[Schema.Optional[_]]
val enumSchema = optionalSchema.toEnum
Expand All @@ -63,7 +63,7 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
)(isTrue)
}
},
testM("tuple") {
test("tuple") {
check(SchemaGen.anyPrimitive <*> SchemaGen.anyPrimitive) {
case (leftSchema, rightSchema) =>
val tupleSchema: Schema.Tuple[_, _] = (leftSchema <*> rightSchema).asInstanceOf[Schema.Tuple[_, _]]
Expand All @@ -81,7 +81,7 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
)(isTrue)
}
},
testM("either") {
test("either") {
check(SchemaGen.anyPrimitive <*> SchemaGen.anyPrimitive) {
case (leftSchema, rightSchema) =>
val eitherSchema: Schema.EitherSchema[_, _] =
Expand All @@ -103,7 +103,7 @@ object AccessorBuilderSpec extends DefaultRunnableSpec {
)(isTrue)
}
},
testM("lazy") {
test("lazy") {
check(SchemaGen.anyPrimitive) { schema =>
val lazySchema = Schema.defer(schema)
val eagerAccessor: Any = schema.makeAccessors(builder)
Expand Down
Loading