resolved conflicts and use Headers.connection

zio · Feb 3, 2022 · f79fefe · f79fefe · github-actions · Feb 3, 2022
2 parents 016b930 + c1a306e
commit f79fefe
Show file tree

Hide file tree

Showing 30 changed files with 735 additions and 351 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.3.3
+version = 3.4.0
 maxColumn = 120
 
 align.preset = more

diff --git a/BENCHMARKS.md b/BENCHMARKS.md
diff --git a/README.md b/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

diff --git a/build.sbt b/build.sbt
@@ -124,6 +124,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)