Merge pull request #653 from phadej/aeson-1.1

Support aeson-1.1

servant-client/servant-client.cabal

@@ -37,7 +37,7 @@ library
   build-depends:
       base                  >= 4.7      && < 4.10
     , base-compat           >= 0.9.1    && < 0.10
-    , aeson                 >= 0.7      && < 1.1
+    , aeson                 >= 0.7      && < 1.2
     , attoparsec            >= 0.12     && < 0.14
     , base64-bytestring     >= 1.0.0.1  && < 1.1
     , bytestring            >= 0.10     && < 0.11

servant-server/servant-server.cabal

@@ -47,7 +47,7 @@ library
   build-depends:
         base               >= 4.7  && < 4.10
       , base-compat        >= 0.9  && < 0.10
-      , aeson              >= 0.7  && < 1.1
+      , aeson              >= 0.7  && < 1.2
       , attoparsec         >= 0.12 && < 0.14
       , base64-bytestring  >= 1.0  && < 1.1
       , bytestring         >= 0.10 && < 0.11
@@ -117,7 +117,7 @@ test-suite spec
     , directory
     , exceptions
     , hspec == 2.*
-    , hspec-wai
+    , hspec-wai >= 0.8 && <0.9
     , http-types
     , network >= 2.6
     , QuickCheck

servant-server/test/Servant/Server/ErrorSpec.hs

@@ -211,11 +211,17 @@ errorRetrySpec =
 
   it "should continue when URLs don't match" $ do
     request methodPost "" [jsonCT, jsonAccept] jsonBody
-     `shouldRespondWith` 200 { matchBody = Just $ encode (8 :: Int) }
+     `shouldRespondWith` 200 { matchBody = mkBody $ encode (8 :: Int) }
 
   it "should continue when methods don't match" $ do
     request methodGet "a" [jsonCT, jsonAccept] jsonBody
-     `shouldRespondWith` 200 { matchBody = Just $ encode (4 :: Int) }
+     `shouldRespondWith` 200 { matchBody = mkBody $ encode (4 :: Int) }
+  where
+    mkBody b = MatchBody $ \_ b' ->
+      if b == b'
+        then Nothing
+        else Just "body not correct\n"
+
 
 -- }}}
 ------------------------------------------------------------------------------

servant/servant.cabal

@@ -51,7 +51,7 @@ library
   build-depends:
       base                  >= 4.7  && < 4.10
     , base-compat           >= 0.9  && < 0.10
-    , aeson                 >= 0.7  && < 1.1
+    , aeson                 >= 0.7  && < 1.2
     , attoparsec            >= 0.12 && < 0.14
     , bytestring            >= 0.10 && < 0.11
     , case-insensitive      >= 1.2  && < 1.3

stack-ghc-7.8.4.yaml

@@ -11,10 +11,12 @@ extra-deps:
 - control-monad-omega-0.3.1
 - cryptonite-0.6
 - doctest-0.11.0
-- hspec-2.2.3
+- hspec-2.3.2
-- hspec-core-2.2.3
+- hspec-discover-2.3.2
-- hspec-discover-2.2.3
+- hspec-core-2.3.2
-- hspec-expectations-0.7.2
+- hspec-wai-0.8.0
+- hspec-expectations-0.8.2
+- call-stack-0.1.0
 - http-api-data-0.3
 - natural-transformation-0.4
 - primitive-0.6.1.0

stack-ghc-8.0.1.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2016-05-27
+resolver: nightly-2016-12-31
 packages:
 - servant/
 - servant-client/
@@ -6,7 +6,5 @@ packages:
 - servant-foreign/
 - servant-server/
 extra-deps:
-- http-api-data-0.3
+- aeson-1.1.0.0
-- uri-bytestring-0.2.2.0
-- natural-transformation-0.4
 flags: {}

stack.yaml

@@ -10,4 +10,10 @@ extra-deps:
 - http-api-data-0.3
 - servant-js-0.9 # needed for tutorial
 - natural-transformation-0.4
+- hspec-2.3.2
+- hspec-discover-2.3.2
+- hspec-core-2.3.2
+- hspec-wai-0.8.0
+- hspec-expectations-0.8.2
+- call-stack-0.1.0
 resolver: lts-6.0