From f7d5c0149f026b3e0a6117f1e5836fe4043da1fe Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 15 Dec 2019 01:12:05 +0200 Subject: [PATCH] Allow warp-3.3 in master --- changelog.d/z-dependency-upgrades | 3 ++- servant-conduit/servant-conduit.cabal | 2 +- servant-machines/servant-machines.cabal | 2 +- servant-pipes/servant-pipes.cabal | 2 +- servant-server/servant-server.cabal | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changelog.d/z-dependency-upgrades b/changelog.d/z-dependency-upgrades index 8e7197bc..43d72ef0 100644 --- a/changelog.d/z-dependency-upgrades +++ b/changelog.d/z-dependency-upgrades @@ -1,8 +1,9 @@ synopsis: Dependency upgrades prs: + #1173 #1181 #1183 #1188 #1224 #1245 - #1173 + #1257 diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index e1247803..4aec51d8 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/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 diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index 80aeb450..31f1de7d 100644 --- a/servant-machines/servant-machines.cabal +++ b/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 diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index 480ddd26..5fdc4b5a 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/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 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 1e81a47a..0372ac16 100644 --- a/servant-server/servant-server.cabal +++ b/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