Back merge main 9 feb 2022

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,13 +11,13 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **To Reproduce**
-Steps to reproduce the behavior:
+Steps to reproduce the behaviour:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**Expected behaviour**
 A clear and concise description of what you expected to happen.
 
 **Screenshots**

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.15, 2.13.8, 3.1.0]
+        scala: [2.12.15, 2.13.8, 3.1.1]
         java: [graal_21.1.0@11, temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -143,12 +143,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.1.0)
+      - name: Download target directories (3.1.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.1.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3.1.0)
+      - name: Inflate target directories (3.1.1)
         run: |
           tar xf targets.tar
           rm targets.tar

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.2
 maxColumn = 120
 
 align.preset = more
@@ -24,3 +24,4 @@ newlines.afterInfix = keep
 rewrite.rules = [RedundantParens]
 trailingCommas = "always"
 runner.dialect = Scala213Source3
+docstrings.wrapMaxColumn = 80

README.md

@@ -21,7 +21,6 @@ Check out the full documentation here: [Documentation]
 - [ZIO Http](#zio-http)
 - [Getting Started](#getting-started)
 - [Installation](#installation)
-- [Benchmarks](#benchmarks)
 - [Documentation](https://dream11.github.io/zio-http/)
 
 # Getting Started
@@ -35,7 +34,7 @@ import zhttp.service.Server
 
 object HelloWorld extends ZIOAppDefault {
   val app = Http.collect[Request] {
-    case Method.GET -> Root / "text" => Response.text("Hello World!")
+    case Method.GET -> !! / "text" => Response.text("Hello World!")
   }
 
   val run =
@@ -69,7 +68,7 @@ libraryDependencies += "io.d11" %% "zhttp"      % "[version]"
 libraryDependencies += "io.d11" %% "zhttp-test" % "[version]" % Test
 ```
 
-**NOTE:** Currently ZIO Http is compatible with `ZIO 1.x` only. The library will migrate to `ZIO 2.x` as soon as a stable release is published.
+**NOTE:** ZIO Http is compatible with `ZIO 1.x` and `ZIO 2.x`.
 
 
 # Watch Mode

build.sbt

@@ -101,13 +101,11 @@ lazy val zhttp = (project in file("zio-http"))
   .settings(
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
     libraryDependencies ++= Seq(
-      sttp,
       netty,
       `zio`,
       `zio-streams`,
       `zio-test`,
       `zio-test-sbt`,
-      `sttp-zio`,
       `netty-incubator`,
       `scala-compact-collection`,
     ),
@@ -128,6 +126,6 @@ lazy val zhttpTest = (project in file("zio-http-test"))
 lazy val example = (project in file("./example"))
   .settings(stdSettings("example"))
   .settings(publishSetting(false))
-  .settings(runSettings("example.FileStreaming"))
+  .settings(runSettings("example.Main"))
   .settings(libraryDependencies ++= Seq(`jwt-core`))
   .dependsOn(zhttp)