git.iko.soy/servant
on master help sign in
Merge pull request #730 from phadej/aeson-1.2
832b359Oleg Grenrus
.travis.yml+1−1
compare with master
unifiedsplit
@@ -5,7 +5,7 @@ language: c
5env:
5env:
6 - STACK_YAML=stack-ghc-7.8.4.yaml
6 - STACK_YAML=stack-ghc-7.8.4.yaml
7 - STACK_YAML=stack.yaml
7 - STACK_YAML=stack.yaml
8− - STACK_YAML=stack-ghc-8.0.1.yaml
8+ - STACK_YAML=stack-ghc-8.0.2.yaml
9
9
10addons:
10addons:
11 apt:
11 apt:
servant-client/servant-client.cabal+2−2
@@ -38,7 +38,7 @@ library
38 build-depends:
38 build-depends:
39 base >= 4.7 && < 4.10
39 base >= 4.7 && < 4.10
40 , base-compat >= 0.9.1 && < 0.10
40 , base-compat >= 0.9.1 && < 0.10
41− , aeson >= 0.7 && < 1.2
41+ , aeson >= 0.7 && < 1.3
42 , attoparsec >= 0.12 && < 0.14
42 , attoparsec >= 0.12 && < 0.14
43 , base64-bytestring >= 1.0.0.1 && < 1.1
43 , base64-bytestring >= 1.0.0.1 && < 1.1
44 , bytestring >= 0.10 && < 0.11
44 , bytestring >= 0.10 && < 0.11
@@ -52,7 +52,7 @@ library
52 , monad-control >= 1.0.0.4 && < 1.1
52 , monad-control >= 1.0.0.4 && < 1.1
53 , network-uri >= 2.6 && < 2.7
53 , network-uri >= 2.6 && < 2.7
54 , safe >= 0.3.9 && < 0.4
54 , safe >= 0.3.9 && < 0.4
55− , semigroupoids >= 4.3 && < 5.2
55+ , semigroupoids >= 4.3 && < 5.3
56 , servant == 0.10.*
56 , servant == 0.10.*
57 , string-conversions >= 0.3 && < 0.5
57 , string-conversions >= 0.3 && < 0.5
58 , text >= 1.2 && < 1.3
58 , text >= 1.2 && < 1.3
servant-server/servant-server.cabal+1−1
@@ -51,7 +51,7 @@ library
51 build-depends:
51 build-depends:
52 base >= 4.7 && < 4.10
52 base >= 4.7 && < 4.10
53 , base-compat >= 0.9 && < 0.10
53 , base-compat >= 0.9 && < 0.10
54− , aeson >= 0.7 && < 1.2
54+ , aeson >= 0.7 && < 1.3
55 , attoparsec >= 0.12 && < 0.14
55 , attoparsec >= 0.12 && < 0.14
56 , base64-bytestring >= 1.0 && < 1.1
56 , base64-bytestring >= 1.0 && < 1.1
57 , bytestring >= 0.10 && < 0.11
57 , bytestring >= 0.10 && < 0.11
servant/servant.cabal+1−1
@@ -56,7 +56,7 @@ library
56 build-depends:
56 build-depends:
57 base >= 4.7 && < 4.10
57 base >= 4.7 && < 4.10
58 , base-compat >= 0.9 && < 0.10
58 , base-compat >= 0.9 && < 0.10
59− , aeson >= 0.7 && < 1.2
59+ , aeson >= 0.7 && < 1.3
60 , attoparsec >= 0.12 && < 0.14
60 , attoparsec >= 0.12 && < 0.14
61 , bytestring >= 0.10 && < 0.11
61 , bytestring >= 0.10 && < 0.11
62 , case-insensitive >= 1.2 && < 1.3
62 , case-insensitive >= 1.2 && < 1.3
servant/test/Servant/Utils/LinksSpec.hs+4−2
@@ -71,9 +71,11 @@ spec = describe "Servant.Utils.Links" $ do
71-- Before https://github.com/CRogers/should-not-typecheck/issues/5 is fixed,
71-- Before https://github.com/CRogers/should-not-typecheck/issues/5 is fixed,
72-- we'll just use doctest
72-- we'll just use doctest
73--
73--
74+-- with TypeError comparing for errors is difficult.
75+--
74-- >>> apiLink (Proxy :: Proxy WrongPath)
76-- >>> apiLink (Proxy :: Proxy WrongPath)
75-- ...
77-- ...
76−-- ...Could not deduce...
78+-- ......:...:...
77-- ...
79-- ...
78--
80--
79-- >>> apiLink (Proxy :: Proxy WrongReturnType)
81-- >>> apiLink (Proxy :: Proxy WrongReturnType)
@@ -83,7 +85,7 @@ spec = describe "Servant.Utils.Links" $ do
83--
85--
84-- >>> apiLink (Proxy :: Proxy WrongContentType)
86-- >>> apiLink (Proxy :: Proxy WrongContentType)
85-- ...
87-- ...
86−-- ...Could not deduce...
88+-- ......:...:...
87-- ...
89-- ...
88--
90--
89-- >>> apiLink (Proxy :: Proxy WrongMethod)
91-- >>> apiLink (Proxy :: Proxy WrongMethod)
stack-ghc-8.0.1.yaml → stack-ghc-8.0.2.yamlrenamed+2−3
@@ -1,4 +1,4 @@
1−resolver: nightly-2016-12-31
1+resolver: nightly-2017-04-01
2packages:
2packages:
3- servant/
3- servant/
4- servant-client/
4- servant-client/
@@ -7,5 +7,4 @@ packages:
7- servant-server/
7- servant-server/
8- doc/tutorial
8- doc/tutorial
9extra-deps:
9extra-deps:
10−- aeson-1.1.0.0
10+- aeson-1.2.0.0
11−- servant-js-0.9.1