diff --git a/.travis.yml b/.travis.yml index 1a006a6b..aa33923a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: c env: - STACK_YAML=stack-ghc-7.8.4.yaml - STACK_YAML=stack.yaml - - STACK_YAML=stack-ghc-8.0.1.yaml + - STACK_YAML=stack-ghc-8.0.2.yaml addons: apt: diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2aa50c88..eba2378b 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -38,7 +38,7 @@ library build-depends: base >= 4.7 && < 4.10 , base-compat >= 0.9.1 && < 0.10 - , aeson >= 0.7 && < 1.2 + , aeson >= 0.7 && < 1.3 , 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 fe3496a7..2c37760e 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -51,7 +51,7 @@ library build-depends: base >= 4.7 && < 4.10 , base-compat >= 0.9 && < 0.10 - , aeson >= 0.7 && < 1.2 + , aeson >= 0.7 && < 1.3 , 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 ec4de2a3..64039227 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -56,7 +56,7 @@ library build-depends: base >= 4.7 && < 4.10 , base-compat >= 0.9 && < 0.10 - , aeson >= 0.7 && < 1.2 + , aeson >= 0.7 && < 1.3 , 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.2.yaml similarity index 65% rename from stack-ghc-8.0.1.yaml rename to stack-ghc-8.0.2.yaml index 939e6218..f49ec06a 100644 --- a/stack-ghc-8.0.1.yaml +++ b/stack-ghc-8.0.2.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2016-12-31 +resolver: nightly-2017-04-01 packages: - servant/ - servant-client/ @@ -7,5 +7,4 @@ packages: - servant-server/ - doc/tutorial extra-deps: -- aeson-1.1.0.0 -- servant-js-0.9.1 +- aeson-1.2.0.0