Merge pull request #730 from phadej/aeson-1.2

Allow aeson-1.2

.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:

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
@@ -52,7 +52,7 @@ library
     , monad-control         >= 1.0.0.4  && < 1.1
     , network-uri           >= 2.6      && < 2.7
     , safe                  >= 0.3.9    && < 0.4
-    , semigroupoids         >= 4.3      && < 5.2
+    , semigroupoids         >= 4.3      && < 5.3
     , servant               == 0.10.*
     , string-conversions    >= 0.3      && < 0.5
     , text                  >= 1.2      && < 1.3

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

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

servant/test/Servant/Utils/LinksSpec.hs

@@ -71,9 +71,11 @@ spec = describe "Servant.Utils.Links" $ do
 -- Before https://github.com/CRogers/should-not-typecheck/issues/5 is fixed,
 -- we'll just use doctest
 --
+-- with TypeError comparing for errors is difficult.
+--
 -- >>> apiLink (Proxy :: Proxy WrongPath)
 -- ...
--- ...Could not deduce...
+-- ......:...:...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy WrongReturnType)
@@ -83,7 +85,7 @@ spec = describe "Servant.Utils.Links" $ do
 --
 -- >>> apiLink (Proxy :: Proxy WrongContentType)
 -- ...
--- ...Could not deduce...
+-- ......:...:...
 -- ...
 --
 -- >>> apiLink (Proxy :: Proxy WrongMethod)

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