4ece88e · typeable/servant

git.iko.soy/typeable/servant

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

Allow warp-3.3 in master

commit4ece88e4d96d9603632f4ec142ec318f62aad509 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 15 Dec 2019, 12:47 (7 years ago) parent0215b60 f7d5c01

5 files changed+7−6

compare with master

unifiedsplit

changelog.d/z-dependency-upgrades+2−1 servant-conduit/servant-conduit.cabal+1−1 servant-machines/servant-machines.cabal+1−1 servant-pipes/servant-pipes.cabal+1−1 servant-server/servant-server.cabal+2−2

changelog.d/z-dependency-upgrades+2−1

@@ -1,8 +1,9 @@

11synopsis: Dependency upgrades

22prs:

3+ #1173

34 #1181

45 #1183

56 #1188

67 #1224

78 #1245

8− #1173

9+ #1257

servant-conduit/servant-conduit.cabal+1−1

@@ -63,6 +63,6 @@ test-suite example

6363 , servant-server >=0.15 && <0.17

6464 , servant-client >=0.15 && <0.17

6565 , wai >=3.2.1.2 && <3.3

66− , warp >=3.2.25 && <3.3

66+ , warp >=3.2.25 && <3.4

6767 , http-client

6868 default-language: Haskell2010

servant-machines/servant-machines.cabal+1−1

@@ -60,6 +60,6 @@ test-suite example

6060 , servant-server >=0.15 && <0.17

6161 , servant-client >=0.15 && <0.17

6262 , wai >=3.2.1.2 && <3.3

63− , warp >=3.2.25 && <3.3

63+ , warp >=3.2.25 && <3.4

6464 , http-client

6565 default-language: Haskell2010

servant-pipes/servant-pipes.cabal+1−1

@@ -63,6 +63,6 @@ test-suite example

6363 , servant-server >=0.15 && <0.17

6464 , servant-client >=0.15 && <0.17

6565 , wai >=3.2.1.2 && <3.3

66− , warp >=3.2.25 && <3.3

66+ , warp >=3.2.25 && <3.4

6767 , http-client

6868 default-language: Haskell2010

servant-server/servant-server.cabal+2−2

@@ -121,7 +121,7 @@ executable greet

121121

122122 build-depends:

123123 aeson >= 1.4.1.0 && < 1.5

124− , warp >= 3.2.25 && < 3.3

124+ , warp >= 3.2.25 && < 3.4

125125

126126test-suite spec

127127 type: exitcode-stdio-1.0

@@ -165,7 +165,7 @@ test-suite spec

165165 aeson >= 1.4.1.0 && < 1.5

166166 , directory >= 1.3.0.0 && < 1.4

167167 , hspec >= 2.6.0 && < 2.8

168− , hspec-wai >= 0.9.0 && < 0.10

168+ , hspec-wai >= 0.10.1 && < 0.11

169169 , QuickCheck >= 2.12.6.1 && < 2.14

170170 , should-not-typecheck >= 2.1.0 && < 2.2

171171 , temporary >= 1.3 && < 1.4