Merge pull request #1257 from haskell-servant/warp-3.3b

Allow warp-3.3 in master

Author: phadej

changelog.d/z-dependency-upgrades

@@ -1,8 +1,9 @@
 synopsis: Dependency upgrades
 prs:
+  #1173
   #1181
   #1183
   #1188
   #1224
   #1245
-  #1173
+  #1257

servant-conduit/servant-conduit.cabal

@@ -63,6 +63,6 @@ test-suite example
     , servant-server >=0.15     && <0.17
     , servant-client >=0.15     && <0.17
     , wai            >=3.2.1.2  && <3.3
-    , warp           >=3.2.25   && <3.3
+    , warp           >=3.2.25   && <3.4
     , http-client
   default-language: Haskell2010

servant-machines/servant-machines.cabal

@@ -60,6 +60,6 @@ test-suite example
     , servant-server >=0.15     && <0.17
     , servant-client >=0.15     && <0.17
     , wai            >=3.2.1.2  && <3.3
-    , warp           >=3.2.25   && <3.3
+    , warp           >=3.2.25   && <3.4
     , http-client
   default-language: Haskell2010

servant-pipes/servant-pipes.cabal

@@ -63,6 +63,6 @@ test-suite example
     , servant-server    >=0.15     && <0.17
     , servant-client    >=0.15     && <0.17
     , wai               >=3.2.1.2  && <3.3
-    , warp              >=3.2.25   && <3.3
+    , warp              >=3.2.25   && <3.4
     , http-client
   default-language: Haskell2010

servant-server/servant-server.cabal

@@ -121,7 +121,7 @@ executable greet
 
   build-depends:
       aeson               >= 1.4.1.0  && < 1.5
-    , warp                >= 3.2.25   && < 3.3
+    , warp                >= 3.2.25   && < 3.4
 
 test-suite spec
   type: exitcode-stdio-1.0
@@ -165,7 +165,7 @@ test-suite spec
       aeson                >= 1.4.1.0  && < 1.5
     , directory            >= 1.3.0.0  && < 1.4
     , hspec                >= 2.6.0    && < 2.8
-    , hspec-wai            >= 0.9.0    && < 0.10
+    , hspec-wai            >= 0.10.1   && < 0.11
     , QuickCheck           >= 2.12.6.1 && < 2.14
     , should-not-typecheck >= 2.1.0    && < 2.2
     , temporary            >= 1.3      && < 1.4