upgrade zio version to 2.0.0-RC4(#1178)

docs/index.md

@@ -83,7 +83,7 @@ import zio.test._
 import zhttp.test._
 import zhttp.http._
 
-object Spec extends DefaultRunnableSpec {
+object Spec extends ZIOSpecDefault {
   val app = Http.collect[Request] {
     case Method.GET -> Root / "text" => Response.text("Hello World!")
   }

docs/website/docs/v1.x/dsl/cookies.md

@@ -82,7 +82,7 @@ To sign all the cookies in your `HttpApp`, you can use `signCookies` middleware:
   }
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app @@ signCookies("secret")).exitCode
 ``` 
 

docs/website/docs/v1.x/dsl/cookies/index.md

@@ -79,7 +79,7 @@ To sign all the cookies in your `HttpApp`, you can use `signCookies` middleware:
   }
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app @@ signCookies("secret")).exitCode
 ``` 
 

docs/website/docs/v1.x/dsl/headers.md

@@ -51,7 +51,7 @@ On the Server-side you can read Request headers as given below
   import zio.stream.ZStream
 
   object SimpleResponseDispatcher extends App {
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+    override def run(args: List[String]): UIO[ExitCode] = {
 
       // Starting the server (for more advanced startup configuration checkout `HelloWorldAdvanced`)
       Server.start(8090, app.silent).exitCode
@@ -155,7 +155,7 @@ val responseHeaders: Task[Headers] =  Client.request(url).map(_.headers)
         _    <- Console.printLine { data }
       } yield ()
 
-      override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = program.exitCode.provideCustomLayer(env)
+      override def run(args: List[String]): URIO[Any, ExitCode] = program.exitCode.provideLayer(env)
 
     }
     ```

docs/website/docs/v1.x/dsl/headers/index.md

@@ -48,7 +48,7 @@ On the Server-side you can read Request headers as given below
   import zio.stream.ZStream
 
   object SimpleResponseDispatcher extends App {
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+    override def run(args: List[String]): UIO[ExitCode] = {
 
       // Starting the server (for more advanced startup configuration checkout `HelloWorldAdvanced`)
       Server.start(8090, app.silent).exitCode
@@ -152,7 +152,7 @@ val responseHeaders: Task[Headers] =  Client.request(url).map(_.headers)
         _    <- Console.printLine { data }
       } yield ()
 
-      override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = program.exitCode.provideCustomLayer(env)
+      override def run(args: List[String]): URIO[Any, ExitCode] = program.exitCode.provideLayer(env)
 
     }
     ```

docs/website/docs/v1.x/dsl/http.md

@@ -195,17 +195,6 @@ application.
 
 There are many operators to provide the HTTP application with its required environment.
 
-### provideCustomLayer
-
-Provides the HTTP application with the part of the environment that is not part of the ZEnv, leaving an effect that only depends on the ZEnv.
-
-```scala
-  val a: Http[Clock, DateTimeException, String, OffsetDateTime] = Http.collectZIO[String] {
-    case "case 1"    => clock.currentDateTime
-  }
-  val app: Http[zio.ZEnv, DateTimeException, String, OffsetDateTime] = a.provideCustomLayer(Clock.live)
-```
-
 ## Attaching Middleware
 
 Middlewares are essentially transformations that one can apply to any `Http` to produce a new one. To attach middleware to the HTTP application, you can use `middleware` operator. `@@` is an alias for `middleware`.
@@ -226,7 +215,7 @@ The below snippet tests an app that takes `Int` as input and responds by adding
     import zio.test.Assertion.equalTo
     import zio.test._
 
-    object Spec extends DefaultRunnableSpec {
+    object Spec extends ZIOSpecDefault {
 
       def spec = suite("http")(
         testM("1 + 1 = 2") {
@@ -365,6 +354,6 @@ We can use `Server.app()` method to bootstrap the server with an `HttpApp[R,E]`
 
   object HelloWorld extends App {
     val app: HttpApp[Any, Nothing] = Http.ok
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = Server.start(8090, app).exitCode
+    override def run(args: List[String]): UIO[ExitCode] = Server.start(8090, app).exitCode
   } 
 ```

docs/website/docs/v1.x/dsl/http/index.md

@@ -192,17 +192,6 @@ application.
 
 There are many operators to provide the HTTP application with its required environment.
 
-### provideCustomLayer
-
-Provides the HTTP application with the part of the environment that is not part of the ZEnv, leaving an effect that only depends on the ZEnv.
-
-```scala
-  val a: Http[Clock, DateTimeException, String, OffsetDateTime] = Http.collectZIO[String] {
-    case "case 1"    => clock.currentDateTime
-  }
-  val app: Http[zio.ZEnv, DateTimeException, String, OffsetDateTime] = a.provideCustomLayer(Clock.live)
-```
-
 ## Attaching Middleware
 
 Middlewares are essentially transformations that one can apply to any `Http` to produce a new one. To attach middleware to the HTTP application, you can use `middleware` operator. `@@` is an alias for `middleware`.
@@ -223,7 +212,7 @@ The below snippet tests an app that takes `Int` as input and responds by adding
     import zio.test.Assertion.equalTo
     import zio.test._
 
-    object Spec extends DefaultRunnableSpec {
+    object Spec extends ZIOSpecDefault {
 
       def spec = suite("http")(
         test("1 + 1 = 2") {
@@ -362,6 +351,6 @@ We can use `Server.app()` method to bootstrap the server with an `HttpApp[R,E]`
 
   object HelloWorld extends App {
     val app: HttpApp[Any, Nothing] = Http.ok
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = Server.start(8090, app).exitCode
+    override def run(args: List[String]): UIO[ExitCode] = Server.start(8090, app).exitCode
   } 
 ```

docs/website/docs/v1.x/dsl/server.md

@@ -7,7 +7,7 @@ This section describes, ZIO HTTP Server and different configurations you can pro
 
 ## Start a ZIO HTTP Server with default configurations
 ```scala
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app.silent).exitCode
 ```
 ## Start a ZIO HTTP Server with custom configurations.
@@ -28,12 +28,12 @@ This section describes, ZIO HTTP Server and different configurations you can pro
     ```
 3. And then use ```Server.make``` to get a "managed" instance use it to run a server forever
     ```scala
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+    override def run(args: List[String]): UIO[ExitCode] = {
       server.make
         .use(start =>
           console.putStrLn(s"Server started on port ${start.port}")
           *> ZIO.never,
-        ).provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(2))
+        ).provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(2))
         .exitCode
     ```
    **Tip :** `ServerChannelFactory.auto ++ EventLoopGroup.auto(num Threads)` is supplied as an external dependency to choose netty transport type. One can leave it as `auto` to let the application handle it for you. 
@@ -76,7 +76,7 @@ object HelloWorldAdvanced extends App {
             Server.paranoidLeakDetection ++ // Paranoid leak detection (affects performance)
             Server.app(fooBar +++ app)      // Setup the Http app
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
     // Configure thread count using CLI
     val nThreads: Int = args.headOption.flatMap(x => Try(x.toInt).toOption).getOrElse(0)
 
@@ -89,7 +89,7 @@ object HelloWorldAdvanced extends App {
                       // Ensures the server doesn't die after printing
                       *> ZIO.never,
             )
-            .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
+            .provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
             .exitCode
   }
 }

docs/website/docs/v1.x/dsl/server/index.md

@@ -4,7 +4,7 @@ This section describes, ZIO HTTP Server and different configurations you can pro
 
 ## Start a ZIO HTTP Server with default configurations
 ```scala
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app.silent).exitCode
 ```
 ## Start a ZIO HTTP Server with custom configurations.
@@ -25,12 +25,12 @@ This section describes, ZIO HTTP Server and different configurations you can pro
     ```
 3. And then use ```Server.make``` to get a "managed" instance use it to run a server forever
     ```scala
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+    override def run(args: List[String]): UIO[ExitCode] = {
       server.make
         .use(start =>
           Console.printLine(s"Server started on port ${start.port}")
           *> ZIO.never,
-        ).provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(2))
+        ).provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(2))
         .exitCode
     ```
    **Tip :** `ServerChannelFactory.auto ++ EventLoopGroup.auto(num Threads)` is supplied as an external dependency to choose netty transport type. One can leave it as `auto` to let the application handle it for you. 
@@ -73,7 +73,7 @@ object HelloWorldAdvanced extends App {
             Server.paranoidLeakDetection ++ // Paranoid leak detection (affects performance)
             Server.app(fooBar +++ app)      // Setup the Http app
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
     // Configure thread count using CLI
     val nThreads: Int = args.headOption.flatMap(x => Try(x.toInt).toOption).getOrElse(0)
 
@@ -86,7 +86,7 @@ object HelloWorldAdvanced extends App {
                       // Ensures the server doesn't die after printing
                       *> ZIO.never,
             )
-            .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
+            .provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
             .exitCode
   }
 }

docs/website/docs/v1.x/examples/advanced-examples/advanced_server.md

@@ -27,7 +27,7 @@ object HelloWorldAdvanced extends App {
       Server.paranoidLeakDetection ++ // Paranoid leak detection (affects performance)
       Server.app(fooBar ++ app)       // Setup the Http app
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
     // Configure thread count using CLI
     val nThreads: Int = args.headOption.flatMap(x => Try(x.toInt).toOption).getOrElse(0)
 
@@ -40,7 +40,7 @@ object HelloWorldAdvanced extends App {
         // Ensures the server doesn't die after printing
           *> ZIO.never,
       )
-      .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
+      .provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(nThreads))
       .exitCode
   }
 }

docs/website/docs/v1.x/examples/advanced-examples/concrete-entity.md

@@ -25,7 +25,7 @@ object ConcreteEntity extends App {
       .map(userCreated => Response.text(userCreated.id.toString)) // Http[Any, Nothing, Request, Response]
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app).exitCode
 }
 

docs/website/docs/v1.x/examples/advanced-examples/cors.md

@@ -18,7 +18,7 @@ object HelloWorldWithCORS extends App {
       } @@ cors(config)
 
     // Run it like any simple app
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+    override def run(args: List[String]): UIO[ExitCode] =
       Server.start(8090, app.silent).exitCode
 }
 ```

docs/website/docs/v1.x/examples/advanced-examples/middleware_basic_auth.md

@@ -19,7 +19,7 @@ object BasicAuth extends App {
   val app: UHttpApp = user @@ basicAuth("admin", "admin")
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app).exitCode
 }
 

docs/website/docs/v1.x/examples/advanced-examples/middleware_cors.md

@@ -18,7 +18,7 @@ object HelloWorldWithCORS extends App {
       } @@ cors(config)
 
     // Run it like any simple app
-    override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+    override def run(args: List[String]): UIO[ExitCode] =
       Server.start(8090, app.silent).exitCode
 }
 ```

docs/website/docs/v1.x/examples/advanced-examples/middleware_csrf.md

@@ -18,7 +18,7 @@ object CSRF extends App {
   } @@ csrfGenerate() // set x-csrf token cookie
 
   val app                                                        = publicApp ++ privateApp
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app).exitCode
 }
 

docs/website/docs/v1.x/examples/advanced-examples/stream-file.md

@@ -26,7 +26,7 @@ object FileStreaming extends App {
   }
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app.silent).exitCode
 }
 

docs/website/docs/v1.x/examples/advanced-examples/stream-response.md

@@ -10,7 +10,7 @@ import zio._
  * Example to encode content using a ZStream
  */
 object StreamingResponse extends App {
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
 
     // Starting the server (for more advanced startup configuration checkout `HelloWorldAdvanced`)
     Server.start(8090, app.silent).exitCode

docs/website/docs/v1.x/examples/advanced-examples/web-socket-advanced.md

@@ -54,7 +54,7 @@ object WebSocketAdvanced extends App {
       case Method.GET -> !! / "subscriptions" => socketApp.toResponse
     }
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app).exitCode
 }
 

docs/website/docs/v1.x/examples/zio-http-basic-examples/http_client.md

@@ -15,8 +15,8 @@ object SimpleClient extends App {
     _    <- Console.printLine { data }
   } yield ()
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
-    program.exitCode.provideCustomLayer(env)
+  override def run(args: List[String]): UIO[ExitCode] =
+    program.exitCode.provideLayer(env)
 
 }
 ```

docs/website/docs/v1.x/examples/zio-http-basic-examples/http_server.md

@@ -14,7 +14,7 @@ object HelloWorld extends App {
   }
 
   // Run it like any simple app
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app.silent).exitCode
 }
 ```

docs/website/docs/v1.x/examples/zio-http-basic-examples/https-server.md

@@ -29,9 +29,9 @@ object HttpsHelloWorld extends App {
       ServerSSLOptions(sslctx, SSLHttpBehaviour.Accept),
     )
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
     server.make.useForever
-      .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(0))
+      .provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(0))
       .exitCode
   }
 }

docs/website/docs/v1.x/examples/zio-http-basic-examples/https_client.md

@@ -35,8 +35,8 @@ object HttpsClient extends App {
     _    <- console.putStrLn { data }
   } yield ()
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] 
-    = program.exitCode.provideCustomLayer(env)
+  override def run(args: List[String]): UIO[ExitCode] 
+    = program.exitCode.provideLayer(env)
 
 }
 ```

docs/website/docs/v1.x/examples/zio-http-basic-examples/https_server.md

@@ -29,9 +29,9 @@ object HttpsHelloWorld extends App {
       ServerSSLOptions(sslctx, SSLHttpBehaviour.Accept),
     )
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] = {
+  override def run(args: List[String]): UIO[ExitCode] = {
     server.make.useForever
-      .provideCustomLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(0))
+      .provideLayer(ServerChannelFactory.auto ++ EventLoopGroup.auto(0))
       .exitCode
   }
 }

docs/website/docs/v1.x/examples/zio-http-basic-examples/web-socket.md

@@ -24,7 +24,7 @@ object WebSocketEcho extends App {
       case Method.GET -> !! / "subscriptions" => socket.toResponse
     }
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): UIO[ExitCode] =
     Server.start(8090, app).exitCode
 }
 

docs/website/docs/v1.x/getting-started.md

@@ -105,7 +105,7 @@ Since `Http` is a function of the form `A => ZIO[R, Option[E], B]` to test it yo
 import zio.test._
 import zhttp.http._
 
-object Spec extends DefaultRunnableSpec {
+object Spec extends ZIOSpecDefault {
 
   def spec = suite("http")(
       testM("should be ok") {
@@ -159,7 +159,7 @@ import zio._
 object HelloWorld extends App {
   val app = Http.ok
 
-  override def run(args: List[String]): URIO[zio.ZEnv, ExitCode] =
+  override def run(args: List[String]): URIO[Any, ExitCode] =
     Server.start(8090, app).exitCode
 }
 ```