Merge pull request #160 from senia-psm/zio_2.0.0

zio 2.0.0

build.sbt

@@ -27,7 +27,7 @@ ThisBuild / publishTo := sonatypePublishToBundle.value
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 
-lazy val zioVersion      = "2.0.0-RC6"
+lazy val zioVersion      = "2.0.0"
 lazy val akkaVersion     = "2.6.19"
 lazy val akkaHttpVersion = "10.2.9"
 

src/main/scala/zio/test/akkahttp/AkkaZIOSpecDefault.scala

@@ -1,13 +1,12 @@
 package zio.test.akkahttp
 
 import zio._
-import zio.test.{Spec, TestEnvironment, ZIOSpec}
+import zio.test.{testEnvironment, Spec, TestEnvironment, ZIOSpec}
 
 trait AkkaZIOSpecDefault extends ZIOSpec[RouteTestEnvironment.TestEnvironment with TestEnvironment] with RouteTest {
 
-  override val bootstrap
-      : ZLayer[ZIOAppArgs with Scope, Any, RouteTestEnvironment.TestEnvironment with TestEnvironment] =
-    zio.ZEnv.live >>> TestEnvironment.live >+> RouteTestEnvironment.environment
+  override val bootstrap: ZLayer[Scope, Any, RouteTestEnvironment.TestEnvironment with TestEnvironment] =
+    testEnvironment >+> RouteTestEnvironment.environment
 
   def spec: Spec[RouteTestEnvironment.TestEnvironment with TestEnvironment with Scope, Any]
 }

src/main/scala/zio/test/akkahttp/RouteTestResult.scala

@@ -10,6 +10,7 @@ import akka.http.scaladsl.server.Rejection
 import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, FromResponseUnmarshaller, Unmarshal}
 import akka.stream.Materializer
 import akka.stream.scaladsl.{Sink, Source}
+import zio.Unsafe.unsafeCompat
 import zio._
 import zio.test.akkahttp.RouteTest.Environment
 import zio.test.akkahttp.RouteTestResult.Completed
@@ -159,11 +160,15 @@ object RouteTestResult {
 
     def entityAs[T : FromEntityUnmarshaller : ClassTag]: Either[Throwable, T] =
       // The entry is already in memory. Run here is not so bad.
-      runtime.unsafeRun(ZIO.fromFuture(implicit ec => Unmarshal(entity).to[T]).either)
+      unsafeCompat { implicit u =>
+        runtime.unsafe.run(ZIO.fromFuture(implicit ec => Unmarshal(entity).to[T]).either).getOrThrow()
+      }
 
     def responseAs[T : FromResponseUnmarshaller : ClassTag]: Either[Throwable, T] =
       // The response is already in memory. Run here is not so bad.
-      runtime.unsafeRun(ZIO.fromFuture(implicit ec => Unmarshal(response).to[T]).either)
+      unsafeCompat { implicit u =>
+        runtime.unsafe.run(ZIO.fromFuture(implicit ec => Unmarshal(response).to[T]).either).getOrThrow()
+      }
 
     def contentType: ContentType = entity.contentType