eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #730 from phadej/aeson-1.2

Browse source 
Allow aeson-1.2
This commit is contained in:
Oleg Grenrus 2017-04-23 22:18:08 +03:00 committed by GitHub
commit 832b359380
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -5,7 +5,7 @@ language: c
env: env:
- STACK_YAML=stack-ghc-7.8.4.yaml - STACK_YAML=stack-ghc-7.8.4.yaml
- STACK_YAML=stack.yaml - STACK_YAML=stack.yaml
- STACK_YAML=stack-ghc-8.0.1.yaml - STACK_YAML=stack-ghc-8.0.2.yaml
addons: addons:
apt: apt:

4
servant-client/servant-client.cabal
View file

@ -38,7 +38,7 @@ library
build-depends: build-depends:
base >= 4.7 && < 4.10 base >= 4.7 && < 4.10
, base-compat >= 0.9.1 && < 0.10 , base-compat >= 0.9.1 && < 0.10
, aeson >= 0.7 && < 1.2 , aeson >= 0.7 && < 1.3
, attoparsec >= 0.12 && < 0.14 , attoparsec >= 0.12 && < 0.14
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, bytestring >= 0.10 && < 0.11 , bytestring >= 0.10 && < 0.11
@ -52,7 +52,7 @@ library
, monad-control >= 1.0.0.4 && < 1.1 , monad-control >= 1.0.0.4 && < 1.1
, network-uri >= 2.6 && < 2.7 , network-uri >= 2.6 && < 2.7
, safe >= 0.3.9 && < 0.4 , safe >= 0.3.9 && < 0.4
, semigroupoids >= 4.3 && < 5.2 , semigroupoids >= 4.3 && < 5.3
, servant == 0.10.* , servant == 0.10.*
, string-conversions >= 0.3 && < 0.5 , string-conversions >= 0.3 && < 0.5
, text >= 1.2 && < 1.3 , text >= 1.2 && < 1.3

2
servant-server/servant-server.cabal
View file

@ -51,7 +51,7 @@ library
build-depends: build-depends:
base >= 4.7 && < 4.10 base >= 4.7 && < 4.10
, base-compat >= 0.9 && < 0.10 , base-compat >= 0.9 && < 0.10
, aeson >= 0.7 && < 1.2 , aeson >= 0.7 && < 1.3
, attoparsec >= 0.12 && < 0.14 , attoparsec >= 0.12 && < 0.14
, base64-bytestring >= 1.0 && < 1.1 , base64-bytestring >= 1.0 && < 1.1
, bytestring >= 0.10 && < 0.11 , bytestring >= 0.10 && < 0.11

2
servant/servant.cabal
View file

@ -56,7 +56,7 @@ library
build-depends: build-depends:
base >= 4.7 && < 4.10 base >= 4.7 && < 4.10
, base-compat >= 0.9 && < 0.10 , base-compat >= 0.9 && < 0.10
, aeson >= 0.7 && < 1.2 , aeson >= 0.7 && < 1.3
, attoparsec >= 0.12 && < 0.14 , attoparsec >= 0.12 && < 0.14
, bytestring >= 0.10 && < 0.11 , bytestring >= 0.10 && < 0.11
, case-insensitive >= 1.2 && < 1.3 , case-insensitive >= 1.2 && < 1.3

6
servant/test/Servant/Utils/LinksSpec.hs
View file

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

5
stack-ghc-8.0.1.yaml → stack-ghc-8.0.2.yaml
View file

@ -1,4 +1,4 @@
resolver: nightly-2016-12-31 resolver: nightly-2017-04-01
packages: packages:
- servant/ - servant/
- servant-client/ - servant-client/
@ -7,5 +7,4 @@ packages:
- servant-server/ - servant-server/
- doc/tutorial - doc/tutorial
extra-deps: extra-deps:
- aeson-1.1.0.0 - aeson-1.2.0.0
- servant-js-0.9.1