From e49d4911641802bc5d1d448f4bfca32a37483a2a Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 17 Apr 2017 21:35:20 +0300 Subject: [PATCH 1/3] Allow aeson-1.2 --- .travis.yml | 2 +- servant-client/servant-client.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- stack-ghc-8.0.1.yaml => stack-ghc-8.0.2.yaml | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) rename stack-ghc-8.0.1.yaml => stack-ghc-8.0.2.yaml (65%) 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 From c5cd6a217257f50cf40cfd15c3a9b78373785083 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 23 Apr 2017 21:02:51 +0300 Subject: [PATCH 2/3] Allow semigroupoids-5.2 --- servant-client/servant-client.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index eba2378b..eb3fb08e 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -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 From df0755c557f97553725545fb8ab7acbfd5853e37 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 23 Apr 2017 21:06:48 +0300 Subject: [PATCH 3/3] Workaround TypeError doctest failures --- servant/test/Servant/Utils/LinksSpec.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servant/test/Servant/Utils/LinksSpec.hs b/servant/test/Servant/Utils/LinksSpec.hs index 6a6bb8dc..05abd67a 100644 --- a/servant/test/Servant/Utils/LinksSpec.hs +++ b/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)