Merge pull request #53 from scala-steward/update/zio-2.0.0-RC4

Update zio, zio-streams, zio-test, ... to 2.0.0-RC4
zio · Apr 9, 2022 · 0ea97be · 0ea97be
2 parents fd36285 + 1a63037
commit 0ea97be
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 22 deletions.
diff --git a/benchmarks/src/test/scala/zio/parser/benchmarks/BenchmarksSpec.scala b/benchmarks/src/test/scala/zio/parser/benchmarks/BenchmarksSpec.scala
@@ -9,7 +9,7 @@ import zio.test.Assertion.{anything, isRight}
 import zio.test._
 
 /** Tests whether the benchmark examples run with success */
-object BenchmarksSpec extends DefaultRunnableSpec {
+object BenchmarksSpec extends ZIOSpecDefault {
   override def spec: ZSpec[TestEnvironment, Any] =
     suite("Benchmarks")(
       suite("basic")(

diff --git a/build.sbt b/build.sbt
@@ -42,7 +42,7 @@ addCommandAlias(
   ";zioParserNative/test"
 )
 
-val zioVersion = "2.0.0-RC3"
+val zioVersion = "2.0.0-RC5"
 
 lazy val root = (project in file("."))
   .aggregate(

diff --git a/zio-parser-caliban/src/test/scala/zio/parser/caliban/CalibanParserSpec.scala b/zio-parser-caliban/src/test/scala/zio/parser/caliban/CalibanParserSpec.scala
@@ -17,7 +17,7 @@ import zio.test.Assertion._
 import zio.test.TestAspect._
 import zio.test._
 
-object CalibanParserSpec extends DefaultRunnableSpec {
+object CalibanParserSpec extends ZIOSpecDefault {
 
   def spec0: Spec[Any, TestFailure[ParsingError], TestSuccess] = suite("CalibanParserSpec")(
     test("simple query with fields") {

diff --git a/zio-parser/shared/src/main/scala/zio/parser/target/ZStreamTarget.scala b/zio-parser/shared/src/main/scala/zio/parser/target/ZStreamTarget.scala
@@ -2,10 +2,10 @@ package zio.parser.target
 
 import zio.parser.internal.Stack
 import zio.stream.ZStream
-import zio.{ChunkBuilder, Queue, Runtime, UIO, ZIO, ZQueue}
+import zio.{ChunkBuilder, Queue, Runtime, UIO, ZIO}
 
 class ZStreamTarget[R, Output](runtime: Runtime[R]) extends Target[Output] {
-  private val queue: Queue[Output] = runtime.unsafeRun(ZQueue.unbounded[Output])
+  private val queue: Queue[Output] = runtime.unsafeRun(Queue.unbounded[Output])
 
   val stream: ZStream[Any, Nothing, Output] = ZStream.fromQueue(queue)
 

diff --git a/zio-parser/shared/src/test/scala/zio/parser/ParserSpec.scala b/zio-parser/shared/src/test/scala/zio/parser/ParserSpec.scala
@@ -5,7 +5,7 @@ import zio.parser.Parser.ParserError
 import zio.test.Assertion._
 import zio.test._
 
-object ParserSpec extends DefaultRunnableSpec {
+object ParserSpec extends ZIOSpecDefault {
   private val charA: Syntax[String, Char, Char, Char, Char] = Syntax.char('a', "not a").as('a')
   private val charB: Syntax[String, Char, Char, Char, Char] = Syntax.char('b', "not b").as('b')
 

diff --git a/zio-parser/shared/src/test/scala/zio/parser/PrinterSpec.scala b/zio-parser/shared/src/test/scala/zio/parser/PrinterSpec.scala
@@ -4,7 +4,7 @@ import zio.Chunk
 import zio.test.Assertion._
 import zio.test._
 
-object PrinterSpec extends DefaultRunnableSpec {
+object PrinterSpec extends ZIOSpecDefault {
   private val charA: Syntax[String, Char, Char, Char, Char] =
     Syntax.charIn('a')
 

diff --git a/zio-parser/shared/src/test/scala/zio/parser/RegexSpec.scala b/zio-parser/shared/src/test/scala/zio/parser/RegexSpec.scala
@@ -4,9 +4,7 @@ import zio._
 import zio.test.Assertion._
 import zio.test._
 
-import scala.annotation.nowarn
-
-object RegexSpec extends DefaultRunnableSpec {
+object RegexSpec extends ZIOSpecDefault {
   val keywordStrings: List[String] =
     List(
       "abstract",
@@ -62,7 +60,7 @@ object RegexSpec extends DefaultRunnableSpec {
 
   val keywords: Regex.Tabular.Tabular = Regex.Tabular(keywordsRegex)
 
-  override def spec: ZSpec[Environment, Any] =
+  override def spec: ZSpec[TestEnvironment, Any] =
     suite("RegexSpec")(
       suite("string")(
         test("positive matches") {
@@ -211,24 +209,38 @@ object RegexSpec extends DefaultRunnableSpec {
       }
     )
 
-  @nowarn private def singleChar(name: String, r: Regex, test: Char => Boolean, gen: Gen[Random, Char] = Gen.char) =
-    testM(name) {
+  private def singleChar(
+      name: String,
+      r: Regex,
+      f: Char => Boolean,
+      gen: Gen[Any, Char] = Gen.char
+  ): ZSpec[TestConfig, Any] =
+    test(name) {
       val compiled = r.compile
       check(gen) { ch =>
-        assertTrue(compiled.test(0, ch.toString) == 1 == test(ch))
+        assertTrue(compiled.test(0, ch.toString) == 1 == f(ch))
       }
     }
 
-  @nowarn private def multiCharPassing(name: String, r: Regex, gen: Gen[Random, Char]) =
-    testM(name) {
+  private def multiCharPassing(
+      name: String,
+      r: Regex,
+      gen: Gen[Any, Char]
+  ): ZSpec[Sized with TestConfig, Any] =
+    test(name) {
       val compiled = r.compile
       check(Gen.chunkOf1(gen)) { input =>
         assertTrue(compiled.test(0, new String(input.toArray)) == input.length)
       }
     }
 
-  @nowarn private def multiCharFailing(name: String, r: Regex, gen: Gen[Random, Char], counterexample: Char) =
-    testM(name) {
+  private def multiCharFailing(
+      name: String,
+      r: Regex,
+      gen: Gen[Any, Char],
+      counterexample: Char
+  ): ZSpec[Sized with TestConfig, Any] =
+    test(name) {
       val compiled = r.compile
       check(Gen.chunkOf1(gen)) { input =>
         Random.nextIntBetween(0, input.length).map { injectionPoint =>

diff --git a/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala b/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala
@@ -5,7 +5,7 @@ import zio.parser.{Printer, _}
 import zio.test.Assertion._
 import zio.test._
 
-object BashPrettyPrinterExample extends DefaultRunnableSpec {
+object BashPrettyPrinterExample extends ZIOSpecDefault {
   override def spec: ZSpec[TestEnvironment, Any] =
     suite("Bash pretty printer example")(
       suite("Conditions")(

diff --git a/zio-parser/shared/src/test/scala/zio/parser/examples/ContextualExample.scala b/zio-parser/shared/src/test/scala/zio/parser/examples/ContextualExample.scala
@@ -5,7 +5,7 @@ import zio.parser.{Parser, Printer, Syntax, _}
 import zio.test.Assertion._
 import zio.test._
 
-object ContextualExample extends DefaultRunnableSpec {
+object ContextualExample extends ZIOSpecDefault {
 
   // Context sensitive example
 

diff --git a/zio-parser/shared/src/test/scala/zio/parser/examples/ExpressionExample.scala b/zio-parser/shared/src/test/scala/zio/parser/examples/ExpressionExample.scala
@@ -4,7 +4,7 @@ import zio.parser.{Syntax, _}
 import zio.test.Assertion._
 import zio.test._
 
-object ExpressionExample extends DefaultRunnableSpec {
+object ExpressionExample extends ZIOSpecDefault {
 
   sealed trait OpType
   case object Add extends OpType

diff --git a/zio-parser/shared/src/test/scala/zio/parser/examples/JsonExample.scala b/zio-parser/shared/src/test/scala/zio/parser/examples/JsonExample.scala
@@ -5,7 +5,7 @@ import zio.parser.{Syntax, _}
 import zio.test.Assertion.{equalTo, isRight}
 import zio.test._
 
-object JsonExample extends DefaultRunnableSpec {
+object JsonExample extends ZIOSpecDefault {
   sealed abstract class Json
   object Json {
     final case class Obj(fields: Chunk[(String, Json)]) extends Json