Merge pull request #320 from vigoo/zio2

ZIO 2.0.0
vigoo · Jun 24, 2022 · 746ccff · 746ccff
2 parents 4ab118e + 4f29e11
commit 746ccff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -104,9 +104,9 @@ lazy val zio2 = Project("clipp-zio-2", file("clipp-zio-2")).settings(commonSetti
   resolvers +=
     "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
   libraryDependencies ++= Seq(
-    "dev.zio" %% "zio" % "2.0.0-RC6",
-    "dev.zio" %% "zio-test" % "2.0.0-RC6" % Test,
-    "dev.zio" %% "zio-test-sbt" % "2.0.0-RC6" % Test
+    "dev.zio" %% "zio" % "2.0.0",
+    "dev.zio" %% "zio-test" % "2.0.0" % Test,
+    "dev.zio" %% "zio-test-sbt" % "2.0.0" % Test
   ),
 
   testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
@@ -201,4 +201,4 @@ pomPostProcess := { (node: XmlNode) =>
       case _ => node
     }
   }).transform(node).head
-}
+}
diff --git a/clipp-zio-2/src/main/scala/io/github/vigoo/clipp/zioapi/package.scala b/clipp-zio-2/src/main/scala/io/github/vigoo/clipp/zioapi/package.scala
@@ -2,7 +2,7 @@ package io.github.vigoo.clipp
 
 import cats.data.NonEmptyList
 import io.github.vigoo.clipp.errors.CustomParserError
-import zio.{CanFail, Console, Runtime, Tag, URIO, ZIO, ZIOAppArgs, ZLayer}
+import zio.{CanFail, Console, Runtime, Tag, Unsafe, URIO, ZIO, ZIOAppArgs, ZLayer}
 
 package object zioapi {
   type ClippEnv = Any
@@ -32,22 +32,30 @@ package object zioapi {
 
   def liftZIO[R, E, T](description: String, examples: NonEmptyList[T])(f: ZIO[R, E, T])(implicit runtime: Runtime[R], ev: CanFail[E], customParserError: CustomParserError[E]): Parameter.Spec[T] =
     syntax.liftEither(description, examples) {
-      runtime.unsafeRun(f.either)
+      Unsafe.unsafeCompat { implicit u =>
+        runtime.unsafe.run(f.either).getOrThrowFiberFailure()
+      }
     }
 
   def liftZIO[R, E, T](description: String, example: T)(f: ZIO[R, E, T])(implicit runtime: Runtime[R], ev: CanFail[E], customParserError: CustomParserError[E]): Parameter.Spec[T] =
     syntax.liftEither(description, example) {
-      runtime.unsafeRun(f.either)
+      Unsafe.unsafeCompat { implicit u =>
+        runtime.unsafe.run(f.either).getOrThrowFiberFailure()
+      }
     }
 
   def liftURIO[R, T](description: String, examples: NonEmptyList[T])(f: URIO[R, T])(implicit runtime: Runtime[R]): Parameter.Spec[T] =
-    syntax.lift(description, examples) {
-      runtime.unsafeRun(f)
+    syntax.lift(description, examples) { 
+      Unsafe.unsafeCompat { implicit u =>
+        runtime.unsafe.run(f).getOrThrowFiberFailure()
+      }
     }
 
   def liftURIO[R, T](description: String, example: T)(f: URIO[R, T])(implicit runtime: Runtime[R]): Parameter.Spec[T] =
     syntax.lift(description, example) {
-      runtime.unsafeRun(f)
+      Unsafe.unsafeCompat { implicit u =>
+        runtime.unsafe.run(f).getOrThrowFiberFailure()
+      }
     }
 
   case class ZioDSL[R](runtime: Runtime[R]) extends syntax {