git.iko.soy/typeable/servant
on master help sign in
Merge pull request #653 from phadej/aeson-1.1

Support aeson-1.1

commit875f5921fcc460acb59b7e7f76011b62d11a5f9b authorAlp Mestanogullari <alpmestan@gmail.com> dateTue 3 Jan 2017, 11:04 (10 years ago) parent6234eae85feb31
7 files changed+26−14
compare with master
unifiedsplit
servant-client/servant-client.cabal+1−1 servant-server/servant-server.cabal+2−2 servant-server/test/Servant/Server/ErrorSpec.hs+8−2 servant/servant.cabal+1−1 stack-ghc-7.8.4.yaml+6−4 stack-ghc-8.0.1.yaml+2−4 stack.yaml+6
servant-client/servant-client.cabal+1−1
@@ -37,7 +37,7 @@ library
3737 build-depends:
3838 base >= 4.7 && < 4.10
3939 , base-compat >= 0.9.1 && < 0.10
40− , aeson >= 0.7 && < 1.1
40+ , aeson >= 0.7 && < 1.2
4141 , attoparsec >= 0.12 && < 0.14
4242 , base64-bytestring >= 1.0.0.1 && < 1.1
4343 , bytestring >= 0.10 && < 0.11
servant-server/servant-server.cabal+2−2
@@ -47,7 +47,7 @@ library
4747 build-depends:
4848 base >= 4.7 && < 4.10
4949 , base-compat >= 0.9 && < 0.10
50− , aeson >= 0.7 && < 1.1
50+ , aeson >= 0.7 && < 1.2
5151 , attoparsec >= 0.12 && < 0.14
5252 , base64-bytestring >= 1.0 && < 1.1
5353 , bytestring >= 0.10 && < 0.11
@@ -117,7 +117,7 @@ test-suite spec
117117 , directory
118118 , exceptions
119119 , hspec == 2.*
120− , hspec-wai
120+ , hspec-wai >= 0.8 && <0.9
121121 , http-types
122122 , network >= 2.6
123123 , QuickCheck
servant-server/test/Servant/Server/ErrorSpec.hs+8−2
@@ -211,11 +211,17 @@ errorRetrySpec =
211211
212212 it "should continue when URLs don't match" $ do
213213 request methodPost "" [jsonCT, jsonAccept] jsonBody
214− `shouldRespondWith` 200 { matchBody = Just $ encode (8 :: Int) }
214+ `shouldRespondWith` 200 { matchBody = mkBody $ encode (8 :: Int) }
215215
216216 it "should continue when methods don't match" $ do
217217 request methodGet "a" [jsonCT, jsonAccept] jsonBody
218− `shouldRespondWith` 200 { matchBody = Just $ encode (4 :: Int) }
218+ `shouldRespondWith` 200 { matchBody = mkBody $ encode (4 :: Int) }
219+ where
220+ mkBody b = MatchBody $ \_ b' ->
221+ if b == b'
222+ then Nothing
223+ else Just "body not correct\n"
224+
219225
220226-- }}}
221227------------------------------------------------------------------------------
servant/servant.cabal+1−1
@@ -51,7 +51,7 @@ library
5151 build-depends:
5252 base >= 4.7 && < 4.10
5353 , base-compat >= 0.9 && < 0.10
54− , aeson >= 0.7 && < 1.1
54+ , aeson >= 0.7 && < 1.2
5555 , attoparsec >= 0.12 && < 0.14
5656 , bytestring >= 0.10 && < 0.11
5757 , case-insensitive >= 1.2 && < 1.3
stack-ghc-7.8.4.yaml+6−4
@@ -11,10 +11,12 @@ extra-deps:
1111- control-monad-omega-0.3.1
1212- cryptonite-0.6
1313- doctest-0.11.0
14−- hspec-2.2.3
15−- hspec-core-2.2.3
16−- hspec-discover-2.2.3
17−- hspec-expectations-0.7.2
14+- hspec-2.3.2
15+- hspec-discover-2.3.2
16+- hspec-core-2.3.2
17+- hspec-wai-0.8.0
18+- hspec-expectations-0.8.2
19+- call-stack-0.1.0
1820- http-api-data-0.3
1921- natural-transformation-0.4
2022- primitive-0.6.1.0
stack-ghc-8.0.1.yaml+2−4
@@ -1,4 +1,4 @@
1−resolver: nightly-2016-05-27
1+resolver: nightly-2016-12-31
22packages:
33- servant/
44- servant-client/
@@ -6,7 +6,5 @@ packages:
66- servant-foreign/
77- servant-server/
88extra-deps:
9−- http-api-data-0.3
10−- uri-bytestring-0.2.2.0
11−- natural-transformation-0.4
9+- aeson-1.1.0.0
1210flags: {}
stack.yaml+6
@@ -10,4 +10,10 @@ extra-deps:
1010- http-api-data-0.3
1111- servant-js-0.9 # needed for tutorial
1212- natural-transformation-0.4
13+- hspec-2.3.2
14+- hspec-discover-2.3.2
15+- hspec-core-2.3.2
16+- hspec-wai-0.8.0
17+- hspec-expectations-0.8.2
18+- call-stack-0.1.0
1319resolver: lts-6.0