git.iko.soy/servant
on master help sign in
Bump version numbers

- Almost everything 0.15; also servant-foreign jumped to 0.15, for consistency - Bump lower bounds of dependencies to most recent versions atm - Use hspec-2.6.0 - Update `stack.yaml` accordingly - Use base-compat a bit more - Drop aeson-compat dependency (in tests and tutorial)

commit5f947d1c43aec1ed15351339c81f0ff23b04e517 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 9 Nov 2018, 19:04 (8 years ago) parent5e3faa1
20 files changed+157−152
compare with master
unifiedsplit
.travis.yml+2−2 cabal.project+6−2 doc/cookbook/curl-mock/CurlMock.lhs+1−1 doc/cookbook/curl-mock/curl-mock.cabal−1 doc/tutorial/Server.lhs+1−1 doc/tutorial/tutorial.cabal+2−4 servant-client-core/servant-client-core.cabal+11−11 servant-client-ghcjs/servant-client-ghcjs.cabal+7−2 servant-client/servant-client.cabal+22−23 servant-conduit/servant-conduit.cabal+10−10 servant-docs/servant-docs.cabal+12−13 servant-foreign/servant-foreign.cabal+8−9 servant-machines/servant-machines.cabal+8−8 servant-pipes/servant-pipes.cabal+8−8 servant-server/example/greet.hs+3−1 servant-server/servant-server.cabal+26−32 servant-server/src/Servant/Server/Internal/Router.hs+3−1 servant/servant.cabal+12−17 servant/test/Servant/API/ContentTypesSpec.hs+2−1 stack.yaml+13−5
.travis.yml+2−2
@@ -71,7 +71,7 @@ install:
7171 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7272 - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/sentry\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
7373 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
74− - "echo 'allow-newer: servant-js:base, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
74+ - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
7575 - touch cabal.project.local
7676 - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7777 - cat cabal.project || true
@@ -168,7 +168,7 @@ script:
168168 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
169169 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-sentry-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
170170 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
171− - "echo 'allow-newer: servant-js:base, servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
171+ - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
172172 - touch cabal.project.local
173173 - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
174174 - cat cabal.project || true
cabal.project+6−2
@@ -38,5 +38,9 @@ constraints:
3838 memory <0.14.12 || >0.14.12
3939
4040allow-newer:
41− servant-pagination:servant,
42− servant-pagination:servant-server
41+ servant-pagination:servant, servant-pagination:servant-server,
42+ servant-multipart:servant, servant-multipart:servant-server,
43+ servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
44+ servant-auth-server:servant, servant-auth-server:servant-server,
45+ servant-js:servant, servant-js:servant-foreign,
46+ servant-quickcheck:hspec
doc/cookbook/curl-mock/CurlMock.lhs+1−1
@@ -22,7 +22,7 @@ Language extensions and imports:
2222{-# LANGUAGE TypeOperators #-}
2323
2424import Control.Lens ((^.))
25−import Data.Aeson.Compat
25+import Data.Aeson
2626import Data.Aeson.Text
2727import Data.Monoid ((<>))
2828import Data.Proxy (Proxy (Proxy))
doc/cookbook/curl-mock/curl-mock.cabal−1
@@ -14,7 +14,6 @@ executable cookbock-curl-mock
1414 main-is: CurlMock.lhs
1515 build-depends: base == 4.*
1616 , aeson
17− , aeson-compat
1817 , lens
1918 , text
2019 , servant
doc/tutorial/Server.lhs+1−1
@@ -29,7 +29,7 @@ import Prelude.Compat
2929
3030import Control.Monad.Except
3131import Control.Monad.Reader
32−import Data.Aeson.Compat
32+import Data.Aeson
3333import Data.Aeson.Types
3434import Data.Attoparsec.ByteString
3535import Data.ByteString (ByteString)
doc/tutorial/tutorial.cabal+2−4
@@ -36,7 +36,6 @@ library
3636 build-depends:
3737 base >= 4.7 && <4.13
3838 , aeson
39− , aeson-compat
4039 , attoparsec
4140 , base-compat
4241 , bytestring
@@ -67,11 +66,10 @@ library
6766 , blaze-markup >= 0.8.0.0 && < 0.9
6867 , cookie >= 0.4.3 && < 0.5
6968 , js-jquery >= 3.2.1 && < 3.3
70− , lucid >= 2.9.9 && < 2.10
71− , mtl-compat >= 0.2.1 && < 0.3
69+ , lucid >= 2.9.11 && < 2.10
7270 , random >= 1.1 && < 1.2
7371 , servant-js >= 0.9 && < 0.10
74− , time >= 1.4.2 && < 1.9
72+ , time >= 1.6.0.1 && < 1.9
7573
7674 -- For legacy tools, we need to specify build-depends too
7775 build-depends: markdown-unlit >= 0.5.0 && <0.6
servant-client-core/servant-client-core.cabal+11−11
@@ -1,5 +1,5 @@
11name: servant-client-core
2−version: 0.14.1
2+version: 0.15
33synopsis: Core functionality and class for client function generation for servant APIs
44description:
55 This library provides backend-agnostic generation of client functions. For
@@ -56,20 +56,20 @@ library
5656
5757 -- Servant dependencies
5858 build-depends:
59− servant >= 0.14.1 && <0.15
59+ servant >= 0.15 && <0.16
6060
6161 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6262 -- Here can be exceptions if we really need features from the newer versions.
6363 build-depends:
64− aeson >= 1.4.0.0 && < 1.5
65− , base-compat >= 0.10.1 && < 0.11
64+ aeson >= 1.4.1.0 && < 1.5
65+ , base-compat >= 0.10.5 && < 0.11
6666 , base64-bytestring >= 1.0.0.1 && < 1.1
6767 , exceptions >= 0.10.0 && < 0.11
68− , free >= 5.0.2 && < 5.2
68+ , free >= 5.1 && < 5.2
6969 , generics-sop >= 0.4.0.1 && < 0.5
70− , http-api-data >= 0.3.8.1 && < 0.4
71− , http-media >= 0.7.1.2 && < 0.8
72− , http-types >= 0.12.1 && < 0.13
70+ , http-api-data >= 0.3.10 && < 0.4
71+ , http-media >= 0.7.1.3 && < 0.8
72+ , http-types >= 0.12.2 && < 0.13
7373 , network-uri >= 2.6.1.0 && < 2.7
7474 , safe >= 0.3.17 && < 0.4
7575
@@ -94,9 +94,9 @@ test-suite spec
9494
9595 -- Additonal dependencies
9696 build-depends:
97− deepseq >= 1.3.0.2 && < 1.5
98− , hspec >= 2.4.1 && < 2.6
97+ deepseq >= 1.4.2.0 && < 1.5
98+ , hspec >= 2.6.0 && < 2.7
9999 , QuickCheck >= 2.12.6.1 && < 2.13
100100
101101 build-tool-depends:
102− hspec-discover:hspec-discover >= 2.5.1 && <2.6
102+ hspec-discover:hspec-discover >= 2.6.0 && <2.7
servant-client-ghcjs/servant-client-ghcjs.cabal+7−2
@@ -41,12 +41,17 @@ library
4141 , http-media >= 0.6.2 && < 0.8
4242 , http-types >= 0.12 && < 0.13
4343 , monad-control >= 1.0.0.4 && < 1.1
44− , mtl >= 2.1 && < 2.3
44+ , mtl >= 2.2.2 && < 2.3
4545 , semigroupoids >= 4.3 && < 5.3
46− , servant-client-core == 0.14.*
4746 , string-conversions >= 0.3 && < 0.5
4847 , transformers >= 0.3 && < 0.6
4948 , transformers-base >= 0.4.4 && < 0.5
49+
50+
51+ -- strict, as we re-export stuff
52+ build-depends:
53+ servant-client-core == 0.15
54+
5055 hs-source-dirs: src
5156 default-language: Haskell2010
5257 ghc-options: -Wall
servant-client/servant-client.cabal+22−23
@@ -1,5 +1,5 @@
11name: servant-client
2−version: 0.14
2+version: 0.15
33synopsis: automatical derivation of querying functions for servant webservices
44description:
55 This library lets you derive automatically Haskell functions that
@@ -39,34 +39,33 @@ library
3939
4040 -- Bundled with GHC: Lower bound to not force re-installs
4141 -- text and mtl are bundled starting with GHC-8.4
42− --
43− -- note: mtl lower bound is so low because of GHC-7.8
4442 build-depends:
45− base >= 4.7 && < 4.13
46− , bytestring >= 0.10.4.0 && < 0.11
47− , containers >= 0.5.5.1 && < 0.7
48− , mtl >= 2.1 && < 2.3
43+ base >= 4.9 && < 4.13
44+ , bytestring >= 0.10.8.1 && < 0.11
45+ , containers >= 0.5.7.1 && < 0.7
46+ , mtl >= 2.2.2 && < 2.3
47+ , stm >= 2.4.5.1 && < 2.6
4948 , text >= 1.2.3.0 && < 1.3
50− , time >= 1.4.2 && < 1.9
51− , transformers >= 0.3.0.0 && < 0.6
49+ , time >= 1.6.0.1 && < 1.9
50+ , transformers >= 0.5.2.0 && < 0.6
5251
53− -- Servant dependencies
52+ -- Servant dependencies.
53+ -- Strict dependency on `servant-client-core` as we re-export things.
5454 build-depends:
55− servant == 0.14.*
56− , servant-client-core == 0.14.*
55+ servant == 0.15.*
56+ , servant-client-core == 0.15
5757
5858 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5959 -- Here can be exceptions if we really need features from the newer versions.
6060 build-depends:
61− base-compat >= 0.10.1 && < 0.11
62− , http-client >= 0.5.12 && < 0.6
63− , http-media >= 0.7.1.2 && < 0.8
64− , http-types >= 0.12.1 && < 0.13
61+ base-compat >= 0.10.5 && < 0.11
62+ , http-client >= 0.5.13.1 && < 0.6
63+ , http-media >= 0.7.1.3 && < 0.8
64+ , http-types >= 0.12.2 && < 0.13
6565 , exceptions >= 0.10.0 && < 0.11
6666 , kan-extensions >= 5.2 && < 5.3
6767 , monad-control >= 1.0.2.3 && < 1.1
68− , semigroupoids >= 5.2.2 && < 5.4
69− , stm >= 2.4.5.0 && < 2.6
68+ , semigroupoids >= 5.3.1 && < 5.4
7069 , transformers-base >= 0.4.5.2 && < 0.5
7170 , transformers-compat >= 0.6.2 && < 0.7
7271
@@ -107,16 +106,16 @@ test-suite spec
107106 build-depends:
108107 entropy >= 0.4.1.3 && < 0.5
109108 , generics-sop >= 0.4.0.1 && < 0.5
110− , hspec >= 2.5.8 && < 2.6
111− , HUnit >= 1.6 && < 1.7
109+ , hspec >= 2.6.0 && < 2.7
110+ , HUnit >= 1.6.0.0 && < 1.7
112111 , network >= 2.8.0.0 && < 2.9
113112 , QuickCheck >= 2.12.6.1 && < 2.13
114− , servant == 0.14.*
115− , servant-server == 0.14.*
113+ , servant == 0.15.*
114+ , servant-server == 0.15.*
116115 , tdigest >= 0.2 && < 0.3
117116
118117 build-tool-depends:
119− hspec-discover:hspec-discover >= 2.5.8 && < 2.6
118+ hspec-discover:hspec-discover >= 2.6.0 && < 2.7
120119
121120test-suite readme
122121 type: exitcode-stdio-1.0
servant-conduit/servant-conduit.cabal+10−10
@@ -26,12 +26,12 @@ library
2626 exposed-modules: Servant.Conduit
2727 build-depends:
2828 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
30− , conduit >=1.3.0.2 && <1.4
31− , mtl >=2.1 && <2.3
32− , resourcet >=1.2.1 && <1.3
33− , servant >=0.14 && <0.15
34− , unliftio-core >=0.1.1 && <0.2
29+ , bytestring >=0.10.8.1 && <0.11
30+ , conduit >=1.3.1 && <1.4
31+ , mtl >=2.2.2 && <2.3
32+ , resourcet >=1.2.2 && <1.3
33+ , servant >=0.15 && <0.16
34+ , unliftio-core >=0.1.2.0 && <0.2
3535 hs-source-dirs: src
3636 default-language: Haskell2010
3737 ghc-options: -Wall
@@ -51,9 +51,9 @@ test-suite example
5151 , resourcet
5252 , servant
5353 , servant-conduit
54− , servant-server >=0.14 && <0.15
55− , servant-client >=0.14 && <0.15
56− , wai >=3.0.3.0 && <3.3
57− , warp >=3.0.13.1 && <3.3
54+ , servant-server >=0.15 && <0.16
55+ , servant-client >=0.15 && <0.16
56+ , wai >=3.2.1.2 && <3.3
57+ , warp >=3.2.25 && <3.3
5858 , http-client
5959 default-language: Haskell2010
servant-docs/servant-docs.cabal+12−13
@@ -1,6 +1,5 @@
11name: servant-docs
2−version: 0.11.2
3−x-revision: 5
2+version: 0.11.3
43synopsis: generate API docs for your servant webservice
54description:
65 Library for generating API docs from a servant API definition.
@@ -43,28 +42,28 @@ library
4342 --
4443 -- note: mtl lower bound is so low because of GHC-7.8
4544 build-depends:
46− base >= 4.7 && < 4.13
47− , bytestring >= 0.10.4.0 && < 0.11
45+ base >= 4.9 && < 4.13
46+ , bytestring >= 0.10.8.1 && < 0.11
4847 , text >= 1.2.3.0 && < 1.3
4948
5049 -- Servant dependencies
5150 build-depends:
52− servant == 0.13.* || ==0.14.*
51+ servant == 0.15.*
5352
5453 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5554 -- Here can be exceptions if we really need features from the newer versions.
5655 build-depends:
57− aeson >= 1.2.3.0 && < 1.5
56+ aeson >= 1.4.1.0 && < 1.5
5857 , aeson-pretty >= 0.8.5 && < 0.9
59− , base-compat >= 0.9.3 && < 0.11
60− , case-insensitive >= 1.2.0.10 && < 1.3
58+ , base-compat >= 0.10.5 && < 0.11
59+ , case-insensitive >= 1.2.0.11 && < 1.3
6160 , control-monad-omega >= 0.3.1 && < 0.4
62− , hashable >= 1.2.6.1 && < 1.3
63− , http-media >= 0.7.0 && < 0.8
64− , http-types >= 0.12 && < 0.13
65− , lens >= 4.15.4 && < 4.18
61+ , hashable >= 1.2.7.0 && < 1.3
62+ , http-media >= 0.7.1.3 && < 0.8
63+ , http-types >= 0.12.2 && < 0.13
64+ , lens >= 4.17 && < 4.18
6665 , string-conversions >= 0.4.0.1 && < 0.5
67− , unordered-containers >= 0.2.8.0 && < 0.3
66+ , unordered-containers >= 0.2.9.0 && < 0.3
6867
6968 hs-source-dirs: src
7069 default-language: Haskell2010
servant-foreign/servant-foreign.cabal+8−9
@@ -1,6 +1,5 @@
11name: servant-foreign
2−version: 0.11.1
3−x-revision: 3
2+version: 0.15
43synopsis: Helpers for generating clients for servant APIs in any programming language
54description:
65 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -42,19 +41,19 @@ library
4241 --
4342 -- note: mtl lower bound is so low because of GHC-7.8
4443 build-depends:
45− base >= 4.7 && <4.13
44+ base >= 4.9 && < 4.13
4645 , text >= 1.2.3.0 && < 1.3
4746
4847 -- Servant dependencies
4948 build-depends:
50− servant == 0.13.* || ==0.14.*
49+ servant == 0.15.*
5150
5251 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5352 -- Here can be exceptions if we really need features from the newer versions.
5453 build-depends:
55− base-compat >= 0.9.3 && <0.11
56− , lens >= 4.15.4 && <4.18
57− , http-types >= 0.12 && < 0.13
54+ base-compat >= 0.10.5 && < 0.11
55+ , lens >= 4.17 && < 4.18
56+ , http-types >= 0.12.2 && < 0.13
5857
5958 hs-source-dirs: src
6059 default-language: Haskell2010
@@ -75,8 +74,8 @@ test-suite spec
7574
7675 -- Additonal dependencies
7776 build-depends:
78− hspec >= 2.4.4 && <2.6
77+ hspec >= 2.6.0 && <2.7
7978
8079 build-tool-depends:
81− hspec-discover:hspec-discover >=2.4.4 && <2.6
80+ hspec-discover:hspec-discover >=2.6.0 && <2.7
8281 default-language: Haskell2010
servant-machines/servant-machines.cabal+8−8
@@ -26,10 +26,10 @@ library
2626 exposed-modules: Servant.Machines
2727 build-depends:
2828 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
30− , machines >=0.6.3 && <0.7
31− , mtl >=2.1 && <2.3
32− , servant >=0.14 && <0.15
29+ , bytestring >=0.10.8.1 && <0.11
30+ , machines >=0.6.4 && <0.7
31+ , mtl >=2.2.2 && <2.3
32+ , servant >=0.15 && <0.16
3333 hs-source-dirs: src
3434 default-language: Haskell2010
3535 ghc-options: -Wall
@@ -48,9 +48,9 @@ test-suite example
4848 , servant
4949 , machines
5050 , servant-machines
51− , servant-server >=0.14 && <0.15
52− , servant-client >=0.14 && <0.15
53− , wai >=3.0.3.0 && <3.3
54− , warp >=3.0.13.1 && <3.3
51+ , servant-server >=0.15 && <0.16
52+ , servant-client >=0.15 && <0.16
53+ , wai >=3.2.1.2 && <3.3
54+ , warp >=3.2.25 && <3.3
5555 , http-client
5656 default-language: Haskell2010
servant-pipes/servant-pipes.cabal+8−8
@@ -26,12 +26,12 @@ library
2626 exposed-modules: Servant.Pipes
2727 build-depends:
2828 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
29+ , bytestring >=0.10.8.1 && <0.11
3030 , pipes >=4.3.9 && <4.4
3131 , pipes-safe >=2.3.1 && <2.4
32− , mtl >=2.1 && <2.3
32+ , mtl >=2.2.2 && <2.3
3333 , monad-control >=1.0.2.3 && <1.1
34− , servant >=0.14 && <0.15
34+ , servant >=0.15 && <0.16
3535 hs-source-dirs: src
3636 default-language: Haskell2010
3737 ghc-options: -Wall
@@ -51,10 +51,10 @@ test-suite example
5151 , pipes
5252 , pipes-safe
5353 , servant-pipes
54− , pipes-bytestring >= 2.1.6 && <2.2
55− , servant-server >=0.14 && <0.15
56− , servant-client >=0.14 && <0.15
57− , wai >=3.0.3.0 && <3.3
58− , warp >=3.0.13.1 && <3.3
54+ , pipes-bytestring >=2.1.6 && <2.2
55+ , servant-server >=0.15 && <0.16
56+ , servant-client >=0.15 && <0.16
57+ , wai >=3.2.1.2 && <3.3
58+ , warp >=3.2.25 && <3.3
5959 , http-client
6060 default-language: Haskell2010
servant-server/example/greet.hs+3−1
@@ -5,8 +5,10 @@
55{-# LANGUAGE TypeFamilies #-}
66{-# LANGUAGE TypeOperators #-}
77
8+import Prelude ()
9+import Prelude.Compat
10+
811import Data.Aeson
9−import Data.Monoid
1012import Data.Proxy
1113import Data.Text
1214import GHC.Generics
servant-server/servant-server.cabal+26−32
@@ -1,5 +1,5 @@
11name: servant-server
2−version: 0.14.1
2+version: 0.15
33synopsis: A family of combinators for defining webservices APIs and serving them
44description:
55 A family of combinators for defining webservices APIs and serving them
@@ -61,44 +61,37 @@ library
6161
6262 -- Bundled with GHC: Lower bound to not force re-installs
6363 -- text and mtl are bundled starting with GHC-8.4
64− --
65− -- note: mtl lower bound is so low because of GHC-7.8
6664 build-depends:
67− base >= 4.7 && < 4.13
68− , bytestring >= 0.10.4.0 && < 0.11
69− , containers >= 0.5.5.1 && < 0.7
70− , mtl >= 2.1 && < 2.3
65+ base >= 4.9 && < 4.13
66+ , bytestring >= 0.10.8.1 && < 0.11
67+ , containers >= 0.5.7.1 && < 0.7
68+ , mtl >= 2.2.2 && < 2.3
7169 , text >= 1.2.3.0 && < 1.3
72− , transformers >= 0.3.0.0 && < 0.6
73− , filepath >= 1.3.0.2 && < 1.5
74−
75− if !impl(ghc >= 8.0)
76− build-depends:
77− semigroups >= 0.18.4 && < 0.19
70+ , transformers >= 0.5.2.0 && < 0.6
71+ , filepath >= 1.4.1.1 && < 1.5
7872
7973 -- Servant dependencies
8074 build-depends:
81− servant >= 0.14.1 && <0.15
75+ servant >= 0.15 && < 0.16
8276
8377 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8478 -- Here can be exceptions if we really need features from the newer versions.
8579 build-depends:
86− base-compat >= 0.10.1 && < 0.11
80+ base-compat >= 0.10.5 && < 0.11
8781 , base64-bytestring >= 1.0.0.1 && < 1.1
8882 , exceptions >= 0.10.0 && < 0.11
89− , http-api-data >= 0.3.8.1 && < 0.4
90− , http-media >= 0.7.1.2 && < 0.8
91− , http-types >= 0.12.1 && < 0.13
83+ , http-api-data >= 0.3.10 && < 0.4
84+ , http-media >= 0.7.1.3 && < 0.8
85+ , http-types >= 0.12.2 && < 0.13
9286 , network-uri >= 2.6.1.0 && < 2.7
9387 , monad-control >= 1.0.2.3 && < 1.1
94− , network >= 2.6.3.5 && < 2.9
88+ , network >= 2.8 && < 2.9
9589 , string-conversions >= 0.4.0.1 && < 0.5
96− , resourcet >= 1.1.11 && < 1.3
97− , tagged >= 0.8.5 && < 0.9
98− , transformers-base >= 0.4.4 && < 0.5
99− , transformers-compat >= 0.6.2 && < 0.7
100− , wai >= 3.2.1.1 && < 3.3
101− , wai-app-static >= 3.1.6.1 && < 3.2
90+ , resourcet >= 1.2.2 && < 1.3
91+ , tagged >= 0.8.6 && < 0.9
92+ , transformers-base >= 0.4.5.2 && < 0.5
93+ , wai >= 3.2.1.2 && < 3.3
94+ , wai-app-static >= 3.1.6.2 && < 3.2
10295 , word8 >= 0.1.3 && < 0.2
10396
10497 hs-source-dirs: src
@@ -112,14 +105,15 @@ executable greet
112105 default-language: Haskell2010
113106 build-depends:
114107 base
108+ , base-compat
115109 , servant
116110 , servant-server
117111 , wai
118112 , text
119113
120114 build-depends:
121− aeson >= 1.3.1.1 && < 1.5
122− , warp >= 3.2.13 && < 3.3
115+ aeson >= 1.4.1.0 && < 1.5
116+ , warp >= 3.2.25 && < 3.3
123117
124118test-suite spec
125119 type: exitcode-stdio-1.0
@@ -160,17 +154,17 @@ test-suite spec
160154
161155 -- Additonal dependencies
162156 build-depends:
163− aeson >= 1.3.1.1 && < 1.5
164− , directory >= 1.2.1.0 && < 1.4
165− , hspec >= 2.5.1 && < 2.6
157+ aeson >= 1.4.1.0 && < 1.5
158+ , directory >= 1.3.0.0 && < 1.4
159+ , hspec >= 2.6.0 && < 2.7
166160 , hspec-wai >= 0.9.0 && < 0.10
167161 , QuickCheck >= 2.12.6.1 && < 2.13
168162 , should-not-typecheck >= 2.1.0 && < 2.2
169163 , temporary >= 1.3 && < 1.4
170− , wai-extra >= 3.0.21.0 && < 3.1
164+ , wai-extra >= 3.0.24.3 && < 3.1
171165
172166 build-tool-depends:
173− hspec-discover:hspec-discover >= 2.5.1 && <2.6
167+ hspec-discover:hspec-discover >= 2.6.0 && <2.7
174168
175169test-suite doctests
176170 build-depends:
servant-server/src/Servant/Server/Internal/Router.hs+3−1
@@ -4,10 +4,12 @@
44{-# LANGUAGE OverloadedStrings #-}
55module Servant.Server.Internal.Router where
66
7+import Prelude ()
8+import Prelude.Compat
9+
710import Data.Map
811 (Map)
912import qualified Data.Map as M
10−import Data.Monoid
1113import Data.Text
1214 (Text)
1315import qualified Data.Text as T
servant/servant.cabal+12−17
@@ -1,5 +1,5 @@
11name: servant
2−version: 0.14.1
2+version: 0.15
33synopsis: A family of combinators for defining webservices APIs
44description:
55 A family of combinators for defining webservices APIs and serving them
@@ -86,31 +86,27 @@ library
8686 build-depends:
8787 base >= 4.9 && < 4.13
8888 , bytestring >= 0.10.8.1 && < 0.11
89− , mtl >= 2.1 && < 2.3
90− , transformers >= 0.3.0.0 && < 0.6
89+ , mtl >= 2.2.2 && < 2.3
90+ , transformers >= 0.5.2.0 && < 0.6
9191 , text >= 1.2.3.0 && < 1.3
9292
93− if !impl(ghc >= 8.0)
94− build-depends:
95− semigroups >= 0.18.5 && < 0.19
96−
9793 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
9894 -- Here can be exceptions if we really need features from the newer versions.
9995 build-depends:
10096 base-compat >= 0.10.5 && < 0.11
101− , aeson >= 1.3.1.1 && < 1.5
97+ , aeson >= 1.4.1.0 && < 1.5
10298 , attoparsec >= 0.13.2.2 && < 0.14
10399 , bifunctors >= 5.5.3 && < 5.6
104100 , case-insensitive >= 1.2.0.11 && < 1.3
105− , http-api-data >= 0.3.8.1 && < 0.4
106− , http-media >= 0.7.1.2 && < 0.8
107− , http-types >= 0.12.1 && < 0.13
101+ , http-api-data >= 0.3.10 && < 0.4
102+ , http-media >= 0.7.1.3 && < 0.8
103+ , http-types >= 0.12.2 && < 0.13
108104 , mmorph >= 1.1.2 && < 1.2
109105 , network-uri >= 2.6.1.0 && < 2.7
110106 , singleton-bool >= 0.1.4 && < 0.2
111107 , string-conversions >= 0.4.0.1 && < 0.5
112− , tagged >= 0.8.5 && < 0.9
113− , vault >= 0.3.1.1 && < 0.4
108+ , tagged >= 0.8.6 && < 0.9
109+ , vault >= 0.3.1.2 && < 0.4
114110
115111 hs-source-dirs: src
116112 default-language: Haskell2010
@@ -161,13 +157,12 @@ test-suite spec
161157
162158 -- Additonal dependencies
163159 build-depends:
164− aeson-compat >= 0.3.8 && < 0.4
165− , hspec >= 2.5.4 && < 2.6
160+ hspec >= 2.6.0 && < 2.7
166161 , QuickCheck >= 2.12.6.1 && < 2.13
167162 , quickcheck-instances >= 0.3.19 && < 0.4
168163
169164 build-tool-depends:
170− hspec-discover:hspec-discover >= 2.5.4 && < 2.6
165+ hspec-discover:hspec-discover >= 2.6.0 && < 2.7
171166
172167test-suite doctests
173168 build-depends:
@@ -177,7 +172,7 @@ test-suite doctests
177172
178173 -- We test Links failure with doctest, so we need extra dependencies
179174 build-depends:
180− hspec >= 2.5.4 && < 2.6
175+ hspec >= 2.6.0 && < 2.7
181176
182177 type: exitcode-stdio-1.0
183178 main-is: test/doctests.hs
servant/test/Servant/API/ContentTypesSpec.hs+2−1
@@ -10,7 +10,8 @@ module Servant.API.ContentTypesSpec where
1010import Prelude ()
1111import Prelude.Compat
1212
13−import Data.Aeson.Compat
13+import Data.Aeson
14+ (FromJSON, ToJSON (..), Value, decode, encode, object, (.=))
1415import Data.ByteString.Char8
1516 (ByteString, append, pack)
1617import qualified Data.ByteString.Lazy as BSL
stack.yaml+13−5
@@ -16,10 +16,18 @@ packages:
1616# - doc/tutorial/
1717
1818extra-deps:
19+- base-compat-0.10.5
20+- conduit-1.3.1
1921- generics-sop-0.4.0.1
20−- sop-core-0.4.0.0
21−- QuickCheck-2.12.6.1
22+- hspec-2.6.0
23+- hspec-core-2.6.0
24+- hspec-discover-2.6.0
25+- http-api-data-0.3.10
26+- http-media-0.7.1.3
2227- network-2.8.0.0
23−- hspec-2.5.8
24−- hspec-core-2.5.8
25−- hspec-discover-2.5.8
28+- pipes-safe-2.3.1
29+- QuickCheck-2.12.6.1
30+- resourcet-1.2.2
31+- sop-core-0.4.0.0
32+- wai-extra-3.0.24.3
33+- tasty-1.1.0.4