From 1f00a6893765b2d16c5b1f20e6496585d2d1dcfc Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 1 Jan 2017 20:02:56 +0200 Subject: [PATCH] Support aeson-1.1 --- servant-client/servant-client.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- stack-ghc-8.0.1.yaml | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2bbd00cb..65983a3d 100644 --- a/servant-client/servant-client.cabal +++ b/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 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index c790e0a3..89b6a7f5 100644 --- a/servant-server/servant-server.cabal +++ b/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 diff --git a/servant/servant.cabal b/servant/servant.cabal index e93e1cf7..9126a17f 100644 --- a/servant/servant.cabal +++ b/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 diff --git a/stack-ghc-8.0.1.yaml b/stack-ghc-8.0.1.yaml index 21f2dab0..c6024959 100644 --- a/stack-ghc-8.0.1.yaml +++ b/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 -- uri-bytestring-0.2.2.0 -- natural-transformation-0.4 +- aeson-1.1.0.0 flags: {}