git.iko.soy/typeable/servant
on master help sign in
Support GHC-8.4.1 and newer deps
commitc34bd1cfde86caf74b16f872df21803b2b3531bd authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 15 Mar 2018, 10:46 (9 years ago) parent1d55429
12 files changed+67−59
compare with master
unifiedsplit
.travis.yml+6−22 cabal.project+15−1 doc/tutorial/tutorial.cabal+1−1 servant-client-core/servant-client-core.cabal+4−4 servant-client-ghcjs/servant-client-ghcjs.cabal+2−2 servant-client/servant-client.cabal+6−6 servant-docs/servant-docs.cabal+4−4 servant-foreign/CHANGELOG.md+5 servant-foreign/servant-foreign.cabal+8−4 servant-foreign/src/Servant/Foreign/Internal.hs+3−2 servant-server/servant-server.cabal+7−7 servant/servant.cabal+6−6
.travis.yml+6−22
@@ -70,9 +70,9 @@ install:
7070 - rm -fv cabal.project cabal.project.local
7171 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7272 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
73− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/basic-auth\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project"
73+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project"
7474 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
75− - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project"
75+ - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project"
7676 - cat cabal.project
7777 - if [ -f "servant/configure.ac" ]; then
7878 (cd "servant" && autoreconf -i);
@@ -95,18 +95,6 @@ install:
9595 - if [ -f "doc/tutorial/configure.ac" ]; then
9696 (cd "doc/tutorial" && autoreconf -i);
9797 fi
98− - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then
99− (cd "doc/cookbook/db-postgres-pool" && autoreconf -i);
100− fi
101− - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
102− (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
103− fi
104− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
105− (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
106− fi
107− - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then
108− (cd "doc/cookbook/basic-auth" && autoreconf -i);
109− fi
11098 - if [ -f "doc/cookbook/https/configure.ac" ]; then
11199 (cd "doc/cookbook/https" && autoreconf -i);
112100 fi
@@ -120,7 +108,7 @@ install:
120108 (cd "doc/cookbook/file-upload" && autoreconf -i);
121109 fi
122110 - rm -f cabal.project.freeze
123− - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "doc/cookbook/db-postgres-pool"/.ghc.environment.* "doc/cookbook/jwt-and-basic-auth"/.ghc.environment.* "doc/cookbook/db-sqlite-simple"/.ghc.environment.* "doc/cookbook/basic-auth"/.ghc.environment.* "doc/cookbook/https"/.ghc.environment.* "doc/cookbook/structuring-apis"/.ghc.environment.* "doc/cookbook/using-custom-monad"/.ghc.environment.* "doc/cookbook/file-upload"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/https"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/file-upload"/dist
111+ - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/https"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/file-upload"/dist
124112 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
125113
126114# Here starts the actual work to be performed for the package under test;
@@ -135,22 +123,18 @@ script:
135123 - (cd "servant-foreign" && cabal sdist)
136124 - (cd "servant-server" && cabal sdist)
137125 - (cd "doc/tutorial" && cabal sdist)
138− - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
139− - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)
140− - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
141− - (cd "doc/cookbook/basic-auth" && cabal sdist)
142126 - (cd "doc/cookbook/https" && cabal sdist)
143127 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
144128 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
145129 - (cd "doc/cookbook/file-upload" && cabal sdist)
146130 - echo -en 'travis_fold:end:sdist\\r'
147131 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
148− - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/jwt-and-basic-auth"/dist/cookbook-jwt-and-basic-auth-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz ${DISTDIR}/
132+ - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz ${DISTDIR}/
149133 - cd ${DISTDIR} || false
150134 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
151− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project"
135+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project"
152136 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
153− - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project"
137+ - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project"
154138 - cat cabal.project
155139 - echo -en 'travis_fold:end:unpack\\r'
156140
cabal.project+15−1
@@ -5,7 +5,18 @@ packages: servant/
55 servant-foreign/
66 servant-server/
77 doc/tutorial/
8− doc/cookbook/*/*.cabal
8+
9+ -- doc/cookbook/*/*.cabal
10+
11+ -- doc/cookbook/db-postgres-pool
12+ -- doc/cookbook/jwt-and-basic-auth
13+ -- doc/cookbook/db-sqlite-simple
14+ -- doc/cookbook/basic-auth
15+ doc/cookbook/https
16+ doc/cookbook/structuring-apis
17+ doc/cookbook/using-custom-monad
18+ doc/cookbook/file-upload
19+
920
1021allow-newer:
1122 servant-js:servant,
@@ -21,3 +32,6 @@ constraints:
2132 -- see https://github.com/haskell-infra/hackage-trustees/issues/119
2233 foundation >=0.0.14,
2334 memory <0.14.12 || >0.14.12
35+
36+allow-newer:
37+ http-media:base
doc/tutorial/tutorial.cabal+1−1
@@ -34,7 +34,7 @@ library
3434 -- Packages `servant` depends on.
3535 -- We don't need to specify bounds here as this package is never released.
3636 build-depends:
37− base >= 4.7 && <4.11
37+ base >= 4.7 && <4.12
3838 , aeson
3939 , aeson-compat
4040 , attoparsec
servant-client-core/servant-client-core.cabal+4−4
@@ -45,7 +45,7 @@ library
4545 --
4646 -- note: mtl lower bound is so low because of GHC-7.8
4747 build-depends:
48− base >= 4.7 && < 4.11
48+ base >= 4.7 && < 4.12
4949 , bytestring >= 0.10.4.0 && < 0.11
5050 , containers >= 0.5.5.1 && < 0.6
5151 , mtl >= 2.1 && < 2.3
@@ -64,7 +64,7 @@ library
6464 build-depends:
6565 base-compat >= 0.9.3 && < 0.10
6666 , base64-bytestring >= 1.0.0.1 && < 1.1
67− , exceptions >= 0.8.3 && < 0.9
67+ , exceptions >= 0.8.3 && < 0.11
6868 , generics-sop >= 0.3.1.0 && < 0.4
6969 , http-api-data >= 0.3.7.1 && < 0.4
7070 , http-media >= 0.7.1.1 && < 0.8
@@ -95,8 +95,8 @@ test-suite spec
9595 -- Additonal dependencies
9696 build-depends:
9797 deepseq >= 1.3.0.2 && <1.5
98− , hspec >= 2.4.4 && <2.5
98+ , hspec >= 2.4.4 && <2.6
9999 , QuickCheck >= 2.10.1 && < 2.12
100100
101101 build-tool-depends:
102− hspec-discover:hspec-discover >= 2.4.4 && <2.5
102+ hspec-discover:hspec-discover >= 2.4.4 && <2.6
servant-client-ghcjs/servant-client-ghcjs.cabal+2−2
@@ -31,11 +31,11 @@ library
3131 Servant.Client.Ghcjs
3232 Servant.Client.Internal.XhrClient
3333 build-depends:
34− base >= 4.7 && < 4.11
34+ base >= 4.7 && < 4.12
3535 , bytestring >= 0.10 && < 0.11
3636 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
3737 , containers >= 0.5 && < 0.6
38− , exceptions >= 0.8 && < 0.9
38+ , exceptions >= 0.8 && < 0.11
3939 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
4040 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
4141 , http-media >= 0.6.2 && < 0.8
servant-client/servant-client.cabal+6−6
@@ -41,7 +41,7 @@ library
4141 --
4242 -- note: mtl lower bound is so low because of GHC-7.8
4343 build-depends:
44− base >= 4.7 && < 4.11
44+ base >= 4.7 && < 4.12
4545 , bytestring >= 0.10.4.0 && < 0.11
4646 , containers >= 0.5.5.1 && < 0.6
4747 , mtl >= 2.1 && < 2.3
@@ -59,19 +59,19 @@ library
5959 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6060 -- Here can be exceptions if we really need features from the newer versions.
6161 build-depends:
62− aeson >= 1.2.3.0 && < 1.3
62+ aeson >= 1.2.3.0 && < 1.4
6363 , base-compat >= 0.9.3 && < 0.10
6464 , attoparsec >= 0.13.2.0 && < 0.14
6565 , http-client >= 0.5.7.1 && < 0.6
6666 , http-client-tls >= 0.3.5.1 && < 0.4
6767 , http-media >= 0.7.1.1 && < 0.8
6868 , http-types >= 0.12 && < 0.13
69− , exceptions >= 0.8.3 && < 0.9
69+ , exceptions >= 0.8.3 && < 0.11
7070 , monad-control >= 1.0.0.4 && < 1.1
7171 , semigroupoids >= 5.2.1 && < 5.3
7272 , stm >= 2.4.4.1 && < 2.5
7373 , transformers-base >= 0.4.4 && < 0.5
74− , transformers-compat >= 0.5.1 && < 0.6
74+ , transformers-compat >= 0.5.1 && < 0.7
7575
7676 hs-source-dirs: src
7777 default-language: Haskell2010
@@ -114,7 +114,7 @@ test-suite spec
114114 build-depends:
115115 deepseq >= 1.3.0.2 && < 1.5
116116 , generics-sop >= 0.3.1.0 && < 0.4
117− , hspec >= 2.4.4 && < 2.5
117+ , hspec >= 2.4.4 && < 2.6
118118 , HUnit >= 1.6 && < 1.7
119119 , network >= 2.6.3.2 && < 2.7
120120 , QuickCheck >= 2.10.1 && < 2.12
@@ -122,4 +122,4 @@ test-suite spec
122122 , servant-server == 0.13.*
123123
124124 build-tool-depends:
125− hspec-discover:hspec-discover >= 2.4.4 && < 2.5
125+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6
servant-docs/servant-docs.cabal+4−4
@@ -41,7 +41,7 @@ library
4141 --
4242 -- note: mtl lower bound is so low because of GHC-7.8
4343 build-depends:
44− base >= 4.7 && < 4.11
44+ base >= 4.7 && < 4.12
4545 , bytestring >= 0.10.4.0 && < 0.11
4646 , text >= 1.2.3.0 && < 1.3
4747
@@ -56,7 +56,7 @@ library
5656 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5757 -- Here can be exceptions if we really need features from the newer versions.
5858 build-depends:
59− aeson >= 1.2.3.0 && < 1.3
59+ aeson >= 1.2.3.0 && < 1.4
6060 , aeson-pretty >= 0.8.5 && < 0.9
6161 , base-compat >= 0.9.3 && < 0.10
6262 , case-insensitive >= 1.2.0.10 && < 1.3
@@ -108,7 +108,7 @@ test-suite spec
108108
109109 -- Additonal dependencies
110110 build-depends:
111− hspec >= 2.4.4 && < 2.5
111+ hspec >= 2.4.4 && < 2.6
112112
113113 build-tool-depends:
114− hspec-discover:hspec-discover >=2.4.4 && <2.5
114+ hspec-discover:hspec-discover >=2.4.4 && <2.6
servant-foreign/CHANGELOG.md+5
@@ -1,6 +1,11 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-foreign/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.11.1
5+------
6+
7+- Add missing `Semigroup` instances
8+
490.11
510----
611
servant-foreign/servant-foreign.cabal+8−4
@@ -1,5 +1,5 @@
11name: servant-foreign
2−version: 0.11
2+version: 0.11.1
33synopsis: Helpers for generating clients for servant APIs in any programming language
44description:
55 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -42,9 +42,13 @@ library
4242 --
4343 -- note: mtl lower bound is so low because of GHC-7.8
4444 build-depends:
45− base >= 4.7 && <4.11
45+ base >= 4.7 && <4.12
4646 , text >= 1.2.3.0 && < 1.3
4747
48+ if !impl(ghc >= 8.0)
49+ build-depends:
50+ semigroups >=0.18.3 && <0.19
51+
4852 -- Servant dependencies
4953 build-depends:
5054 servant == 0.13.*
@@ -79,8 +83,8 @@ test-suite spec
7983
8084 -- Additonal dependencies
8185 build-depends:
82− hspec >= 2.4.4 && <2.5
86+ hspec >= 2.4.4 && <2.6
8387
8488 build-tool-depends:
85− hspec-discover:hspec-discover >=2.4.4 && <2.5
89+ hspec-discover:hspec-discover >=2.4.4 && <2.6
8690 default-language: Haskell2010
servant-foreign/src/Servant/Foreign/Internal.hs+3−2
@@ -27,6 +27,7 @@ import Control.Lens (makePrisms, makeLenses, Getter, (&), (<>~), (%~),
2727 (.~))
2828import Data.Data (Data)
2929import Data.Proxy
30+import Data.Semigroup (Semigroup)
3031import Data.String
3132import Data.Text
3233import Data.Typeable (Typeable)
@@ -38,12 +39,12 @@ import Servant.API.TypeLevel
3839import Servant.API.Modifiers (RequiredArgument)
3940
4041newtype FunctionName = FunctionName { unFunctionName :: [Text] }
41− deriving (Data, Show, Eq, Monoid, Typeable)
42+ deriving (Data, Show, Eq, Semigroup, Monoid, Typeable)
4243
4344makePrisms ''FunctionName
4445
4546newtype PathSegment = PathSegment { unPathSegment :: Text }
46− deriving (Data, Show, Eq, IsString, Monoid, Typeable)
47+ deriving (Data, Show, Eq, IsString, Semigroup, Monoid, Typeable)
4748
4849makePrisms ''PathSegment
4950
servant-server/servant-server.cabal+7−7
@@ -60,7 +60,7 @@ library
6060 --
6161 -- note: mtl lower bound is so low because of GHC-7.8
6262 build-depends:
63− base >= 4.7 && < 4.11
63+ base >= 4.7 && < 4.12
6464 , bytestring >= 0.10.4.0 && < 0.11
6565 , containers >= 0.5.5.1 && < 0.6
6666 , mtl >= 2.1 && < 2.3
@@ -75,11 +75,11 @@ library
7575 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
7676 -- Here can be exceptions if we really need features from the newer versions.
7777 build-depends:
78− aeson >= 1.2.3.0 && < 1.3
78+ aeson >= 1.2.3.0 && < 1.4
7979 , base-compat >= 0.9.3 && < 0.10
8080 , attoparsec >= 0.13.2.0 && < 0.14
8181 , base64-bytestring >= 1.0.0.1 && < 1.1
82− , exceptions >= 0.8.3 && < 0.9
82+ , exceptions >= 0.8.3 && < 0.11
8383 , http-api-data >= 0.3.7.1 && < 0.4
8484 , http-media >= 0.7.1.1 && < 0.8
8585 , http-types >= 0.12 && < 0.13
@@ -93,7 +93,7 @@ library
9393 , resourcet >= 1.1.9 && < 1.3
9494 , tagged >= 0.8.5 && < 0.9
9595 , transformers-base >= 0.4.4 && < 0.5
96− , transformers-compat >= 0.5.1 && < 0.6
96+ , transformers-compat >= 0.5.1 && < 0.7
9797 , wai >= 3.2.1.1 && < 3.3
9898 , wai-app-static >= 3.1.6.1 && < 3.2
9999 , warp >= 3.2.13 && < 3.3
@@ -164,7 +164,7 @@ test-suite spec
164164 -- Additonal dependencies
165165 build-depends:
166166 directory >= 1.2.1.0 && < 1.4
167− , hspec >= 2.4.4 && < 2.5
167+ , hspec >= 2.4.4 && < 2.6
168168 , hspec-wai >= 0.9 && < 0.10
169169 , should-not-typecheck >= 2.1.0 && < 2.2
170170 , parsec >= 3.1.11 && < 3.2
@@ -173,13 +173,13 @@ test-suite spec
173173 , temporary >= 1.2.0.3 && < 1.3
174174
175175 build-tool-depends:
176− hspec-discover:hspec-discover >=2.4.4 && <2.5
176+ hspec-discover:hspec-discover >=2.4.4 && <2.6
177177
178178test-suite doctests
179179 build-depends:
180180 base
181181 , servant-server
182− , doctest >= 0.13.0 && <0.14
182+ , doctest >= 0.13.0 && <0.16
183183 type: exitcode-stdio-1.0
184184 main-is: test/doctests.hs
185185 buildable: True
servant/servant.cabal+6−6
@@ -69,7 +69,7 @@ library
6969 --
7070 -- note: mtl lower bound is so low because of GHC-7.8
7171 build-depends:
72− base >= 4.7 && < 4.11
72+ base >= 4.7 && < 4.12
7373 , bytestring >= 0.10.4.0 && < 0.11
7474 , mtl >= 2.1 && < 2.3
7575 , text >= 1.2.3.0 && < 1.3
@@ -82,7 +82,7 @@ library
8282 -- Here can be exceptions if we really need features from the newer versions.
8383 build-depends:
8484 base-compat >= 0.9.3 && < 0.10
85− , aeson >= 1.2.3.0 && < 1.3
85+ , aeson >= 1.2.3.0 && < 1.4
8686 , attoparsec >= 0.13.2.0 && < 0.14
8787 , case-insensitive >= 1.2.0.10 && < 1.3
8888 , http-api-data >= 0.3.7.1 && < 0.4
@@ -153,22 +153,22 @@ test-suite spec
153153 -- Additonal dependencies
154154 build-depends:
155155 aeson-compat >= 0.3.3 && < 0.4
156− , hspec >= 2.4.4 && < 2.5
156+ , hspec >= 2.4.4 && < 2.6
157157 , QuickCheck >= 2.10.1 && < 2.12
158158 , quickcheck-instances >= 0.3.16 && < 0.4
159159
160160 build-tool-depends:
161− hspec-discover:hspec-discover >= 2.4.4 && < 2.5
161+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6
162162
163163test-suite doctests
164164 build-depends:
165165 base
166166 , servant
167− , doctest >= 0.13.0 && <0.14
167+ , doctest >= 0.13.0 && <0.16
168168
169169 -- We test Links failure with doctest, so we need extra dependencies
170170 build-depends:
171− hspec >= 2.4.4 && < 2.5
171+ hspec >= 2.4.4 && < 2.6
172172
173173 type: exitcode-stdio-1.0
174174 main-is: test/doctests.hs