From 6999b002977fa1a726ea627f716e47c677047713 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 7 Aug 2016 20:12:09 +0300 Subject: [PATCH] Support aeson-1 --- servant-client/servant-client.cabal | 2 +- servant-js/servant-js.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2dfc4403..089e1209 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -36,7 +36,7 @@ library Servant.Common.Req build-depends: base >= 4.7 && < 4.10 - , aeson >= 0.7 && < 0.12 + , aeson >= 0.7 && < 1.1 , attoparsec >= 0.12 && < 0.14 , base64-bytestring >= 1.0.0.1 && < 1.1 , bytestring >= 0.10 && < 0.11 diff --git a/servant-js/servant-js.cabal b/servant-js/servant-js.cabal index d29dc96c..726e0b4e 100644 --- a/servant-js/servant-js.cabal +++ b/servant-js/servant-js.cabal @@ -65,7 +65,7 @@ executable counter buildable: False build-depends: base >= 4.7 && < 5 - , aeson >= 0.7 && < 0.12 + , aeson >= 0.7 && < 1.1 , filepath >= 1 , lens >= 4 , servant == 0.8.* diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 66a18577..ff84d947 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 && < 0.12 + , aeson >= 0.7 && < 1.1 , 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 48784cac..3c89171f 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 && < 0.12 + , aeson >= 0.7 && < 1.1 , attoparsec >= 0.12 && < 0.14 , bytestring >= 0.10 && < 0.11 , bytestring-conversion >= 0.3 && < 0.4