832b359 · servant · git.iko.soy

git.iko.soy/servant

Merge pull request #730 from phadej/aeson-1.2

Allow aeson-1.2

commit832b35938011be974e351a484890e5f79c4b95f9 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 23 Apr 2017, 22:18 (9 years ago) parent86ad89b df0755c

6 files changed+11−10

compare with master

unifiedsplit

.travis.yml+1−1 servant-client/servant-client.cabal+2−2 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1 servant/test/Servant/Utils/LinksSpec.hs+4−2 stack-ghc-8.0.1.yaml → stack-ghc-8.0.2.yaml+2−3

.travis.yml+1−1

@@ -5,7 +5,7 @@ language: c

55env:

66 - STACK_YAML=stack-ghc-7.8.4.yaml

77 - STACK_YAML=stack.yaml

8− - STACK_YAML=stack-ghc-8.0.1.yaml

8+ - STACK_YAML=stack-ghc-8.0.2.yaml

1010addons:

1111 apt:

servant-client/servant-client.cabal+2−2

@@ -38,7 +38,7 @@ library

3838 build-depends:

3939 base >= 4.7 && < 4.10

4040 , base-compat >= 0.9.1 && < 0.10

41− , aeson >= 0.7 && < 1.2

41+ , aeson >= 0.7 && < 1.3

4242 , attoparsec >= 0.12 && < 0.14

4343 , base64-bytestring >= 1.0.0.1 && < 1.1

4444 , bytestring >= 0.10 && < 0.11

@@ -52,7 +52,7 @@ library

5252 , monad-control >= 1.0.0.4 && < 1.1

5353 , network-uri >= 2.6 && < 2.7

5454 , safe >= 0.3.9 && < 0.4

55− , semigroupoids >= 4.3 && < 5.2

55+ , semigroupoids >= 4.3 && < 5.3

5656 , servant == 0.10.*

5757 , string-conversions >= 0.3 && < 0.5

5858 , text >= 1.2 && < 1.3

servant-server/servant-server.cabal+1−1

@@ -51,7 +51,7 @@ library

5151 build-depends:

5252 base >= 4.7 && < 4.10

5353 , base-compat >= 0.9 && < 0.10

54− , aeson >= 0.7 && < 1.2

54+ , aeson >= 0.7 && < 1.3

5555 , attoparsec >= 0.12 && < 0.14

5656 , base64-bytestring >= 1.0 && < 1.1

5757 , bytestring >= 0.10 && < 0.11

servant/servant.cabal+1−1

@@ -56,7 +56,7 @@ library

5656 build-depends:

5757 base >= 4.7 && < 4.10

5858 , base-compat >= 0.9 && < 0.10

59− , aeson >= 0.7 && < 1.2

59+ , aeson >= 0.7 && < 1.3

6060 , attoparsec >= 0.12 && < 0.14

6161 , bytestring >= 0.10 && < 0.11

6262 , case-insensitive >= 1.2 && < 1.3

servant/test/Servant/Utils/LinksSpec.hs+4−2

@@ -71,9 +71,11 @@ spec = describe "Servant.Utils.Links" $ do

7171-- Before https://github.com/CRogers/should-not-typecheck/issues/5 is fixed,

7272-- we'll just use doctest

7373--

74+-- with TypeError comparing for errors is difficult.

75+--

7476-- >>> apiLink (Proxy :: Proxy WrongPath)

7577-- ...

76−-- ...Could not deduce...

78+-- ......:...:...

7779-- ...

7880--

7981-- >>> apiLink (Proxy :: Proxy WrongReturnType)

@@ -83,7 +85,7 @@ spec = describe "Servant.Utils.Links" $ do

8385--

8486-- >>> apiLink (Proxy :: Proxy WrongContentType)

8587-- ...

86−-- ...Could not deduce...

88+-- ......:...:...

8789-- ...

8890--

8991-- >>> 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

22packages:

33- servant/

44- servant-client/

@@ -7,5 +7,4 @@ packages:

77- servant-server/

88- doc/tutorial

99extra-deps:

10−- aeson-1.1.0.0

11−- servant-js-0.9.1

10+- aeson-1.2.0.0