git.iko.soy/typeable/servant
on master help sign in
Bump version numbers
5f947d1Oleg Grenrus
.travis.yml+2−2
compare with master
unifiedsplit
@@ -71,7 +71,7 @@ install:
71 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
71 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72 - "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"
72 - "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"
73 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
73 - "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"
75 - touch cabal.project.local
75 - touch cabal.project.local
76 - "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"
76 - "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"
77 - cat cabal.project || true
77 - cat cabal.project || true
@@ -168,7 +168,7 @@ script:
168 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
168 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
169 - "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"
169 - "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"
170 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
170 - "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"
172 - touch cabal.project.local
172 - touch cabal.project.local
173 - "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"
173 - "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"
174 - cat cabal.project || true
174 - cat cabal.project || true
cabal.project+6−2
@@ -38,5 +38,9 @@ constraints:
38 memory <0.14.12 || >0.14.12
38 memory <0.14.12 || >0.14.12
39
39
40allow-newer:
40allow-newer:
41− servant-pagination:servant,
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,
42− servant-pagination: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:
22{-# LANGUAGE TypeOperators #-}
22{-# LANGUAGE TypeOperators #-}
23
23
24import Control.Lens ((^.))
24import Control.Lens ((^.))
25−import Data.Aeson.Compat
25+import Data.Aeson
26import Data.Aeson.Text
26import Data.Aeson.Text
27import Data.Monoid ((<>))
27import Data.Monoid ((<>))
28import Data.Proxy (Proxy (Proxy))
28import Data.Proxy (Proxy (Proxy))
doc/cookbook/curl-mock/curl-mock.cabal−1
@@ -14,7 +14,6 @@ executable cookbock-curl-mock
14 main-is: CurlMock.lhs
14 main-is: CurlMock.lhs
15 build-depends: base == 4.*
15 build-depends: base == 4.*
16 , aeson
16 , aeson
17− , aeson-compat
18 , lens
17 , lens
19 , text
18 , text
20 , servant
19 , servant
doc/tutorial/Server.lhs+1−1
@@ -29,7 +29,7 @@ import Prelude.Compat
29
29
30import Control.Monad.Except
30import Control.Monad.Except
31import Control.Monad.Reader
31import Control.Monad.Reader
32−import Data.Aeson.Compat
32+import Data.Aeson
33import Data.Aeson.Types
33import Data.Aeson.Types
34import Data.Attoparsec.ByteString
34import Data.Attoparsec.ByteString
35import Data.ByteString (ByteString)
35import Data.ByteString (ByteString)
doc/tutorial/tutorial.cabal+2−4
@@ -36,7 +36,6 @@ library
36 build-depends:
36 build-depends:
37 base >= 4.7 && <4.13
37 base >= 4.7 && <4.13
38 , aeson
38 , aeson
39− , aeson-compat
40 , attoparsec
39 , attoparsec
41 , base-compat
40 , base-compat
42 , bytestring
41 , bytestring
@@ -67,11 +66,10 @@ library
67 , blaze-markup >= 0.8.0.0 && < 0.9
66 , blaze-markup >= 0.8.0.0 && < 0.9
68 , cookie >= 0.4.3 && < 0.5
67 , cookie >= 0.4.3 && < 0.5
69 , js-jquery >= 3.2.1 && < 3.3
68 , js-jquery >= 3.2.1 && < 3.3
70− , lucid >= 2.9.9 && < 2.10
69+ , lucid >= 2.9.11 && < 2.10
71− , mtl-compat >= 0.2.1 && < 0.3
72 , random >= 1.1 && < 1.2
70 , random >= 1.1 && < 1.2
73 , servant-js >= 0.9 && < 0.10
71 , servant-js >= 0.9 && < 0.10
74− , time >= 1.4.2 && < 1.9
72+ , time >= 1.6.0.1 && < 1.9
75
73
76 -- For legacy tools, we need to specify build-depends too
74 -- For legacy tools, we need to specify build-depends too
77 build-depends: markdown-unlit >= 0.5.0 && <0.6
75 build-depends: markdown-unlit >= 0.5.0 && <0.6
servant-client-core/servant-client-core.cabal+11−11
@@ -1,5 +1,5 @@
1name: servant-client-core
1name: servant-client-core
2−version: 0.14.1
2+version: 0.15
3synopsis: Core functionality and class for client function generation for servant APIs
3synopsis: Core functionality and class for client function generation for servant APIs
4description:
4description:
5 This library provides backend-agnostic generation of client functions. For
5 This library provides backend-agnostic generation of client functions. For
@@ -56,20 +56,20 @@ library
56
56
57 -- Servant dependencies
57 -- Servant dependencies
58 build-depends:
58 build-depends:
59− servant >= 0.14.1 && <0.15
59+ servant >= 0.15 && <0.16
60
60
61 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
61 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
62 -- Here can be exceptions if we really need features from the newer versions.
62 -- Here can be exceptions if we really need features from the newer versions.
63 build-depends:
63 build-depends:
64− aeson >= 1.4.0.0 && < 1.5
64+ aeson >= 1.4.1.0 && < 1.5
65− , base-compat >= 0.10.1 && < 0.11
65+ , base-compat >= 0.10.5 && < 0.11
66 , base64-bytestring >= 1.0.0.1 && < 1.1
66 , base64-bytestring >= 1.0.0.1 && < 1.1
67 , exceptions >= 0.10.0 && < 0.11
67 , exceptions >= 0.10.0 && < 0.11
68− , free >= 5.0.2 && < 5.2
68+ , free >= 5.1 && < 5.2
69 , generics-sop >= 0.4.0.1 && < 0.5
69 , generics-sop >= 0.4.0.1 && < 0.5
70− , http-api-data >= 0.3.8.1 && < 0.4
70+ , http-api-data >= 0.3.10 && < 0.4
71− , http-media >= 0.7.1.2 && < 0.8
71+ , http-media >= 0.7.1.3 && < 0.8
72− , http-types >= 0.12.1 && < 0.13
72+ , http-types >= 0.12.2 && < 0.13
73 , network-uri >= 2.6.1.0 && < 2.7
73 , network-uri >= 2.6.1.0 && < 2.7
74 , safe >= 0.3.17 && < 0.4
74 , safe >= 0.3.17 && < 0.4
75
75
@@ -94,9 +94,9 @@ test-suite spec
94
94
95 -- Additonal dependencies
95 -- Additonal dependencies
96 build-depends:
96 build-depends:
97− deepseq >= 1.3.0.2 && < 1.5
97+ deepseq >= 1.4.2.0 && < 1.5
98− , hspec >= 2.4.1 && < 2.6
98+ , hspec >= 2.6.0 && < 2.7
99 , QuickCheck >= 2.12.6.1 && < 2.13
99 , QuickCheck >= 2.12.6.1 && < 2.13
100
100
101 build-tool-depends:
101 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
41 , http-media >= 0.6.2 && < 0.8
41 , http-media >= 0.6.2 && < 0.8
42 , http-types >= 0.12 && < 0.13
42 , http-types >= 0.12 && < 0.13
43 , monad-control >= 1.0.0.4 && < 1.1
43 , monad-control >= 1.0.0.4 && < 1.1
44− , mtl >= 2.1 && < 2.3
44+ , mtl >= 2.2.2 && < 2.3
45 , semigroupoids >= 4.3 && < 5.3
45 , semigroupoids >= 4.3 && < 5.3
46− , servant-client-core == 0.14.*
47 , string-conversions >= 0.3 && < 0.5
46 , string-conversions >= 0.3 && < 0.5
48 , transformers >= 0.3 && < 0.6
47 , transformers >= 0.3 && < 0.6
49 , transformers-base >= 0.4.4 && < 0.5
48 , 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+
50 hs-source-dirs: src
55 hs-source-dirs: src
51 default-language: Haskell2010
56 default-language: Haskell2010
52 ghc-options: -Wall
57 ghc-options: -Wall
servant-client/servant-client.cabal+22−23
@@ -1,5 +1,5 @@
1name: servant-client
1name: servant-client
2−version: 0.14
2+version: 0.15
3synopsis: automatical derivation of querying functions for servant webservices
3synopsis: automatical derivation of querying functions for servant webservices
4description:
4description:
5 This library lets you derive automatically Haskell functions that
5 This library lets you derive automatically Haskell functions that
@@ -39,34 +39,33 @@ library
39
39
40 -- Bundled with GHC: Lower bound to not force re-installs
40 -- Bundled with GHC: Lower bound to not force re-installs
41 -- text and mtl are bundled starting with GHC-8.4
41 -- text and mtl are bundled starting with GHC-8.4
42− --
43− -- note: mtl lower bound is so low because of GHC-7.8
44 build-depends:
42 build-depends:
45− base >= 4.7 && < 4.13
43+ base >= 4.9 && < 4.13
46− , bytestring >= 0.10.4.0 && < 0.11
44+ , bytestring >= 0.10.8.1 && < 0.11
47− , containers >= 0.5.5.1 && < 0.7
45+ , containers >= 0.5.7.1 && < 0.7
48− , mtl >= 2.1 && < 2.3
46+ , mtl >= 2.2.2 && < 2.3
47+ , stm >= 2.4.5.1 && < 2.6
49 , text >= 1.2.3.0 && < 1.3
48 , text >= 1.2.3.0 && < 1.3
50− , time >= 1.4.2 && < 1.9
49+ , time >= 1.6.0.1 && < 1.9
51− , transformers >= 0.3.0.0 && < 0.6
50+ , transformers >= 0.5.2.0 && < 0.6
52
51
53− -- Servant dependencies
52+ -- Servant dependencies.
53+ -- Strict dependency on `servant-client-core` as we re-export things.
54 build-depends:
54 build-depends:
55− servant == 0.14.*
55+ servant == 0.15.*
56− , servant-client-core == 0.14.*
56+ , servant-client-core == 0.15
57
57
58 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
58 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
59 -- Here can be exceptions if we really need features from the newer versions.
59 -- Here can be exceptions if we really need features from the newer versions.
60 build-depends:
60 build-depends:
61− base-compat >= 0.10.1 && < 0.11
61+ base-compat >= 0.10.5 && < 0.11
62− , http-client >= 0.5.12 && < 0.6
62+ , http-client >= 0.5.13.1 && < 0.6
63− , http-media >= 0.7.1.2 && < 0.8
63+ , http-media >= 0.7.1.3 && < 0.8
64− , http-types >= 0.12.1 && < 0.13
64+ , http-types >= 0.12.2 && < 0.13
65 , exceptions >= 0.10.0 && < 0.11
65 , exceptions >= 0.10.0 && < 0.11
66 , kan-extensions >= 5.2 && < 5.3
66 , kan-extensions >= 5.2 && < 5.3
67 , monad-control >= 1.0.2.3 && < 1.1
67 , monad-control >= 1.0.2.3 && < 1.1
68− , semigroupoids >= 5.2.2 && < 5.4
68+ , semigroupoids >= 5.3.1 && < 5.4
69− , stm >= 2.4.5.0 && < 2.6
70 , transformers-base >= 0.4.5.2 && < 0.5
69 , transformers-base >= 0.4.5.2 && < 0.5
71 , transformers-compat >= 0.6.2 && < 0.7
70 , transformers-compat >= 0.6.2 && < 0.7
72
71
@@ -107,16 +106,16 @@ test-suite spec
107 build-depends:
106 build-depends:
108 entropy >= 0.4.1.3 && < 0.5
107 entropy >= 0.4.1.3 && < 0.5
109 , generics-sop >= 0.4.0.1 && < 0.5
108 , generics-sop >= 0.4.0.1 && < 0.5
110− , hspec >= 2.5.8 && < 2.6
109+ , hspec >= 2.6.0 && < 2.7
111− , HUnit >= 1.6 && < 1.7
110+ , HUnit >= 1.6.0.0 && < 1.7
112 , network >= 2.8.0.0 && < 2.9
111 , network >= 2.8.0.0 && < 2.9
113 , QuickCheck >= 2.12.6.1 && < 2.13
112 , QuickCheck >= 2.12.6.1 && < 2.13
114− , servant == 0.14.*
113+ , servant == 0.15.*
115− , servant-server == 0.14.*
114+ , servant-server == 0.15.*
116 , tdigest >= 0.2 && < 0.3
115 , tdigest >= 0.2 && < 0.3
117
116
118 build-tool-depends:
117 build-tool-depends:
119− hspec-discover:hspec-discover >= 2.5.8 && < 2.6
118+ hspec-discover:hspec-discover >= 2.6.0 && < 2.7
120
119
121test-suite readme
120test-suite readme
122 type: exitcode-stdio-1.0
121 type: exitcode-stdio-1.0
servant-conduit/servant-conduit.cabal+10−10
@@ -26,12 +26,12 @@ library
26 exposed-modules: Servant.Conduit
26 exposed-modules: Servant.Conduit
27 build-depends:
27 build-depends:
28 base >=4.9 && <5
28 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
29+ , bytestring >=0.10.8.1 && <0.11
30− , conduit >=1.3.0.2 && <1.4
30+ , conduit >=1.3.1 && <1.4
31− , mtl >=2.1 && <2.3
31+ , mtl >=2.2.2 && <2.3
32− , resourcet >=1.2.1 && <1.3
32+ , resourcet >=1.2.2 && <1.3
33− , servant >=0.14 && <0.15
33+ , servant >=0.15 && <0.16
34− , unliftio-core >=0.1.1 && <0.2
34+ , unliftio-core >=0.1.2.0 && <0.2
35 hs-source-dirs: src
35 hs-source-dirs: src
36 default-language: Haskell2010
36 default-language: Haskell2010
37 ghc-options: -Wall
37 ghc-options: -Wall
@@ -51,9 +51,9 @@ test-suite example
51 , resourcet
51 , resourcet
52 , servant
52 , servant
53 , servant-conduit
53 , servant-conduit
54− , servant-server >=0.14 && <0.15
54+ , servant-server >=0.15 && <0.16
55− , servant-client >=0.14 && <0.15
55+ , servant-client >=0.15 && <0.16
56− , wai >=3.0.3.0 && <3.3
56+ , wai >=3.2.1.2 && <3.3
57− , warp >=3.0.13.1 && <3.3
57+ , warp >=3.2.25 && <3.3
58 , http-client
58 , http-client
59 default-language: Haskell2010
59 default-language: Haskell2010
servant-docs/servant-docs.cabal+12−13
@@ -1,6 +1,5 @@
1name: servant-docs
1name: servant-docs
2−version: 0.11.2
2+version: 0.11.3
3−x-revision: 5
4synopsis: generate API docs for your servant webservice
3synopsis: generate API docs for your servant webservice
5description:
4description:
6 Library for generating API docs from a servant API definition.
5 Library for generating API docs from a servant API definition.
@@ -43,28 +42,28 @@ library
43 --
42 --
44 -- note: mtl lower bound is so low because of GHC-7.8
43 -- note: mtl lower bound is so low because of GHC-7.8
45 build-depends:
44 build-depends:
46− base >= 4.7 && < 4.13
45+ base >= 4.9 && < 4.13
47− , bytestring >= 0.10.4.0 && < 0.11
46+ , bytestring >= 0.10.8.1 && < 0.11
48 , text >= 1.2.3.0 && < 1.3
47 , text >= 1.2.3.0 && < 1.3
49
48
50 -- Servant dependencies
49 -- Servant dependencies
51 build-depends:
50 build-depends:
52− servant == 0.13.* || ==0.14.*
51+ servant == 0.15.*
53
52
54 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
53 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
55 -- Here can be exceptions if we really need features from the newer versions.
54 -- Here can be exceptions if we really need features from the newer versions.
56 build-depends:
55 build-depends:
57− aeson >= 1.2.3.0 && < 1.5
56+ aeson >= 1.4.1.0 && < 1.5
58 , aeson-pretty >= 0.8.5 && < 0.9
57 , aeson-pretty >= 0.8.5 && < 0.9
59− , base-compat >= 0.9.3 && < 0.11
58+ , base-compat >= 0.10.5 && < 0.11
60− , case-insensitive >= 1.2.0.10 && < 1.3
59+ , case-insensitive >= 1.2.0.11 && < 1.3
61 , control-monad-omega >= 0.3.1 && < 0.4
60 , control-monad-omega >= 0.3.1 && < 0.4
62− , hashable >= 1.2.6.1 && < 1.3
61+ , hashable >= 1.2.7.0 && < 1.3
63− , http-media >= 0.7.0 && < 0.8
62+ , http-media >= 0.7.1.3 && < 0.8
64− , http-types >= 0.12 && < 0.13
63+ , http-types >= 0.12.2 && < 0.13
65− , lens >= 4.15.4 && < 4.18
64+ , lens >= 4.17 && < 4.18
66 , string-conversions >= 0.4.0.1 && < 0.5
65 , 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
68
67
69 hs-source-dirs: src
68 hs-source-dirs: src
70 default-language: Haskell2010
69 default-language: Haskell2010
servant-foreign/servant-foreign.cabal+8−9
@@ -1,6 +1,5 @@
1name: servant-foreign
1name: servant-foreign
2−version: 0.11.1
2+version: 0.15
3−x-revision: 3
4synopsis: Helpers for generating clients for servant APIs in any programming language
3synopsis: Helpers for generating clients for servant APIs in any programming language
5description:
4description:
6 Helper types and functions for generating client functions for servant APIs in any programming language
5 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -42,19 +41,19 @@ library
42 --
41 --
43 -- note: mtl lower bound is so low because of GHC-7.8
42 -- note: mtl lower bound is so low because of GHC-7.8
44 build-depends:
43 build-depends:
45− base >= 4.7 && <4.13
44+ base >= 4.9 && < 4.13
46 , text >= 1.2.3.0 && < 1.3
45 , text >= 1.2.3.0 && < 1.3
47
46
48 -- Servant dependencies
47 -- Servant dependencies
49 build-depends:
48 build-depends:
50− servant == 0.13.* || ==0.14.*
49+ servant == 0.15.*
51
50
52 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
51 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
53 -- Here can be exceptions if we really need features from the newer versions.
52 -- Here can be exceptions if we really need features from the newer versions.
54 build-depends:
53 build-depends:
55− base-compat >= 0.9.3 && <0.11
54+ base-compat >= 0.10.5 && < 0.11
56− , lens >= 4.15.4 && <4.18
55+ , lens >= 4.17 && < 4.18
57− , http-types >= 0.12 && < 0.13
56+ , http-types >= 0.12.2 && < 0.13
58
57
59 hs-source-dirs: src
58 hs-source-dirs: src
60 default-language: Haskell2010
59 default-language: Haskell2010
@@ -75,8 +74,8 @@ test-suite spec
75
74
76 -- Additonal dependencies
75 -- Additonal dependencies
77 build-depends:
76 build-depends:
78− hspec >= 2.4.4 && <2.6
77+ hspec >= 2.6.0 && <2.7
79
78
80 build-tool-depends:
79 build-tool-depends:
81− hspec-discover:hspec-discover >=2.4.4 && <2.6
80+ hspec-discover:hspec-discover >=2.6.0 && <2.7
82 default-language: Haskell2010
81 default-language: Haskell2010
servant-machines/servant-machines.cabal+8−8
@@ -26,10 +26,10 @@ library
26 exposed-modules: Servant.Machines
26 exposed-modules: Servant.Machines
27 build-depends:
27 build-depends:
28 base >=4.9 && <5
28 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
29+ , bytestring >=0.10.8.1 && <0.11
30− , machines >=0.6.3 && <0.7
30+ , machines >=0.6.4 && <0.7
31− , mtl >=2.1 && <2.3
31+ , mtl >=2.2.2 && <2.3
32− , servant >=0.14 && <0.15
32+ , servant >=0.15 && <0.16
33 hs-source-dirs: src
33 hs-source-dirs: src
34 default-language: Haskell2010
34 default-language: Haskell2010
35 ghc-options: -Wall
35 ghc-options: -Wall
@@ -48,9 +48,9 @@ test-suite example
48 , servant
48 , servant
49 , machines
49 , machines
50 , servant-machines
50 , servant-machines
51− , servant-server >=0.14 && <0.15
51+ , servant-server >=0.15 && <0.16
52− , servant-client >=0.14 && <0.15
52+ , servant-client >=0.15 && <0.16
53− , wai >=3.0.3.0 && <3.3
53+ , wai >=3.2.1.2 && <3.3
54− , warp >=3.0.13.1 && <3.3
54+ , warp >=3.2.25 && <3.3
55 , http-client
55 , http-client
56 default-language: Haskell2010
56 default-language: Haskell2010
servant-pipes/servant-pipes.cabal+8−8
@@ -26,12 +26,12 @@ library
26 exposed-modules: Servant.Pipes
26 exposed-modules: Servant.Pipes
27 build-depends:
27 build-depends:
28 base >=4.9 && <5
28 base >=4.9 && <5
29− , bytestring >=0.10.4.0 && <0.11
29+ , bytestring >=0.10.8.1 && <0.11
30 , pipes >=4.3.9 && <4.4
30 , pipes >=4.3.9 && <4.4
31 , pipes-safe >=2.3.1 && <2.4
31 , pipes-safe >=2.3.1 && <2.4
32− , mtl >=2.1 && <2.3
32+ , mtl >=2.2.2 && <2.3
33 , monad-control >=1.0.2.3 && <1.1
33 , monad-control >=1.0.2.3 && <1.1
34− , servant >=0.14 && <0.15
34+ , servant >=0.15 && <0.16
35 hs-source-dirs: src
35 hs-source-dirs: src
36 default-language: Haskell2010
36 default-language: Haskell2010
37 ghc-options: -Wall
37 ghc-options: -Wall
@@ -51,10 +51,10 @@ test-suite example
51 , pipes
51 , pipes
52 , pipes-safe
52 , pipes-safe
53 , servant-pipes
53 , servant-pipes
54− , pipes-bytestring >= 2.1.6 && <2.2
54+ , pipes-bytestring >=2.1.6 && <2.2
55− , servant-server >=0.14 && <0.15
55+ , servant-server >=0.15 && <0.16
56− , servant-client >=0.14 && <0.15
56+ , servant-client >=0.15 && <0.16
57− , wai >=3.0.3.0 && <3.3
57+ , wai >=3.2.1.2 && <3.3
58− , warp >=3.0.13.1 && <3.3
58+ , warp >=3.2.25 && <3.3
59 , http-client
59 , http-client
60 default-language: Haskell2010
60 default-language: Haskell2010
servant-server/example/greet.hs+3−1
@@ -5,8 +5,10 @@
5{-# LANGUAGE TypeFamilies #-}
5{-# LANGUAGE TypeFamilies #-}
6{-# LANGUAGE TypeOperators #-}
6{-# LANGUAGE TypeOperators #-}
7
7
8+import Prelude ()
9+import Prelude.Compat
10+
8import Data.Aeson
11import Data.Aeson
9−import Data.Monoid
10import Data.Proxy
12import Data.Proxy
11import Data.Text
13import Data.Text
12import GHC.Generics
14import GHC.Generics
servant-server/servant-server.cabal+26−32
@@ -1,5 +1,5 @@
1name: servant-server
1name: servant-server
2−version: 0.14.1
2+version: 0.15
3synopsis: A family of combinators for defining webservices APIs and serving them
3synopsis: A family of combinators for defining webservices APIs and serving them
4description:
4description:
5 A family of combinators for defining webservices APIs and serving them
5 A family of combinators for defining webservices APIs and serving them
@@ -61,44 +61,37 @@ library
61
61
62 -- Bundled with GHC: Lower bound to not force re-installs
62 -- Bundled with GHC: Lower bound to not force re-installs
63 -- text and mtl are bundled starting with GHC-8.4
63 -- text and mtl are bundled starting with GHC-8.4
64− --
65− -- note: mtl lower bound is so low because of GHC-7.8
66 build-depends:
64 build-depends:
67− base >= 4.7 && < 4.13
65+ base >= 4.9 && < 4.13
68− , bytestring >= 0.10.4.0 && < 0.11
66+ , bytestring >= 0.10.8.1 && < 0.11
69− , containers >= 0.5.5.1 && < 0.7
67+ , containers >= 0.5.7.1 && < 0.7
70− , mtl >= 2.1 && < 2.3
68+ , mtl >= 2.2.2 && < 2.3
71 , text >= 1.2.3.0 && < 1.3
69 , text >= 1.2.3.0 && < 1.3
72− , transformers >= 0.3.0.0 && < 0.6
70+ , transformers >= 0.5.2.0 && < 0.6
73− , filepath >= 1.3.0.2 && < 1.5
71+ , filepath >= 1.4.1.1 && < 1.5
74−
75− if !impl(ghc >= 8.0)
76− build-depends:
77− semigroups >= 0.18.4 && < 0.19
78
72
79 -- Servant dependencies
73 -- Servant dependencies
80 build-depends:
74 build-depends:
81− servant >= 0.14.1 && <0.15
75+ servant >= 0.15 && < 0.16
82
76
83 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
77 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
84 -- Here can be exceptions if we really need features from the newer versions.
78 -- Here can be exceptions if we really need features from the newer versions.
85 build-depends:
79 build-depends:
86− base-compat >= 0.10.1 && < 0.11
80+ base-compat >= 0.10.5 && < 0.11
87 , base64-bytestring >= 1.0.0.1 && < 1.1
81 , base64-bytestring >= 1.0.0.1 && < 1.1
88 , exceptions >= 0.10.0 && < 0.11
82 , exceptions >= 0.10.0 && < 0.11
89− , http-api-data >= 0.3.8.1 && < 0.4
83+ , http-api-data >= 0.3.10 && < 0.4
90− , http-media >= 0.7.1.2 && < 0.8
84+ , http-media >= 0.7.1.3 && < 0.8
91− , http-types >= 0.12.1 && < 0.13
85+ , http-types >= 0.12.2 && < 0.13
92 , network-uri >= 2.6.1.0 && < 2.7
86 , network-uri >= 2.6.1.0 && < 2.7
93 , monad-control >= 1.0.2.3 && < 1.1
87 , monad-control >= 1.0.2.3 && < 1.1
94− , network >= 2.6.3.5 && < 2.9
88+ , network >= 2.8 && < 2.9
95 , string-conversions >= 0.4.0.1 && < 0.5
89 , string-conversions >= 0.4.0.1 && < 0.5
96− , resourcet >= 1.1.11 && < 1.3
90+ , resourcet >= 1.2.2 && < 1.3
97− , tagged >= 0.8.5 && < 0.9
91+ , tagged >= 0.8.6 && < 0.9
98− , transformers-base >= 0.4.4 && < 0.5
92+ , transformers-base >= 0.4.5.2 && < 0.5
99− , transformers-compat >= 0.6.2 && < 0.7
100− , wai >= 3.2.1.1 && < 3.3
93+ , wai >= 3.2.1.2 && < 3.3
101− , wai-app-static >= 3.1.6.1 && < 3.2
94+ , wai-app-static >= 3.1.6.2 && < 3.2
102 , word8 >= 0.1.3 && < 0.2
95 , word8 >= 0.1.3 && < 0.2
103
96
104 hs-source-dirs: src
97 hs-source-dirs: src
@@ -112,14 +105,15 @@ executable greet
112 default-language: Haskell2010
105 default-language: Haskell2010
113 build-depends:
106 build-depends:
114 base
107 base
108+ , base-compat
115 , servant
109 , servant
116 , servant-server
110 , servant-server
117 , wai
111 , wai
118 , text
112 , text
119
113
120 build-depends:
114 build-depends:
121− aeson >= 1.3.1.1 && < 1.5
115+ aeson >= 1.4.1.0 && < 1.5
122− , warp >= 3.2.13 && < 3.3
116+ , warp >= 3.2.25 && < 3.3
123
117
124test-suite spec
118test-suite spec
125 type: exitcode-stdio-1.0
119 type: exitcode-stdio-1.0
@@ -160,17 +154,17 @@ test-suite spec
160
154
161 -- Additonal dependencies
155 -- Additonal dependencies
162 build-depends:
156 build-depends:
163− aeson >= 1.3.1.1 && < 1.5
157+ aeson >= 1.4.1.0 && < 1.5
164− , directory >= 1.2.1.0 && < 1.4
158+ , directory >= 1.3.0.0 && < 1.4
165− , hspec >= 2.5.1 && < 2.6
159+ , hspec >= 2.6.0 && < 2.7
166 , hspec-wai >= 0.9.0 && < 0.10
160 , hspec-wai >= 0.9.0 && < 0.10
167 , QuickCheck >= 2.12.6.1 && < 2.13
161 , QuickCheck >= 2.12.6.1 && < 2.13
168 , should-not-typecheck >= 2.1.0 && < 2.2
162 , should-not-typecheck >= 2.1.0 && < 2.2
169 , temporary >= 1.3 && < 1.4
163 , temporary >= 1.3 && < 1.4
170− , wai-extra >= 3.0.21.0 && < 3.1
164+ , wai-extra >= 3.0.24.3 && < 3.1
171
165
172 build-tool-depends:
166 build-tool-depends:
173− hspec-discover:hspec-discover >= 2.5.1 && <2.6
167+ hspec-discover:hspec-discover >= 2.6.0 && <2.7
174
168
175test-suite doctests
169test-suite doctests
176 build-depends:
170 build-depends:
servant-server/src/Servant/Server/Internal/Router.hs+3−1
@@ -4,10 +4,12 @@
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
5module Servant.Server.Internal.Router where
5module Servant.Server.Internal.Router where
6
6
7+import Prelude ()
8+import Prelude.Compat
9+
7import Data.Map
10import Data.Map
8 (Map)
11 (Map)
9import qualified Data.Map as M
12import qualified Data.Map as M
10−import Data.Monoid
11import Data.Text
13import Data.Text
12 (Text)
14 (Text)
13import qualified Data.Text as T
15import qualified Data.Text as T
servant/servant.cabal+12−17
@@ -1,5 +1,5 @@
1name: servant
1name: servant
2−version: 0.14.1
2+version: 0.15
3synopsis: A family of combinators for defining webservices APIs
3synopsis: A family of combinators for defining webservices APIs
4description:
4description:
5 A family of combinators for defining webservices APIs and serving them
5 A family of combinators for defining webservices APIs and serving them
@@ -86,31 +86,27 @@ library
86 build-depends:
86 build-depends:
87 base >= 4.9 && < 4.13
87 base >= 4.9 && < 4.13
88 , bytestring >= 0.10.8.1 && < 0.11
88 , bytestring >= 0.10.8.1 && < 0.11
89− , mtl >= 2.1 && < 2.3
89+ , mtl >= 2.2.2 && < 2.3
90− , transformers >= 0.3.0.0 && < 0.6
90+ , transformers >= 0.5.2.0 && < 0.6
91 , text >= 1.2.3.0 && < 1.3
91 , text >= 1.2.3.0 && < 1.3
92
92
93− if !impl(ghc >= 8.0)
94− build-depends:
95− semigroups >= 0.18.5 && < 0.19
96−
97 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
93 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
98 -- Here can be exceptions if we really need features from the newer versions.
94 -- Here can be exceptions if we really need features from the newer versions.
99 build-depends:
95 build-depends:
100 base-compat >= 0.10.5 && < 0.11
96 base-compat >= 0.10.5 && < 0.11
101− , aeson >= 1.3.1.1 && < 1.5
97+ , aeson >= 1.4.1.0 && < 1.5
102 , attoparsec >= 0.13.2.2 && < 0.14
98 , attoparsec >= 0.13.2.2 && < 0.14
103 , bifunctors >= 5.5.3 && < 5.6
99 , bifunctors >= 5.5.3 && < 5.6
104 , case-insensitive >= 1.2.0.11 && < 1.3
100 , case-insensitive >= 1.2.0.11 && < 1.3
105− , http-api-data >= 0.3.8.1 && < 0.4
101+ , http-api-data >= 0.3.10 && < 0.4
106− , http-media >= 0.7.1.2 && < 0.8
102+ , http-media >= 0.7.1.3 && < 0.8
107− , http-types >= 0.12.1 && < 0.13
103+ , http-types >= 0.12.2 && < 0.13
108 , mmorph >= 1.1.2 && < 1.2
104 , mmorph >= 1.1.2 && < 1.2
109 , network-uri >= 2.6.1.0 && < 2.7
105 , network-uri >= 2.6.1.0 && < 2.7
110 , singleton-bool >= 0.1.4 && < 0.2
106 , singleton-bool >= 0.1.4 && < 0.2
111 , string-conversions >= 0.4.0.1 && < 0.5
107 , string-conversions >= 0.4.0.1 && < 0.5
112− , tagged >= 0.8.5 && < 0.9
108+ , tagged >= 0.8.6 && < 0.9
113− , vault >= 0.3.1.1 && < 0.4
109+ , vault >= 0.3.1.2 && < 0.4
114
110
115 hs-source-dirs: src
111 hs-source-dirs: src
116 default-language: Haskell2010
112 default-language: Haskell2010
@@ -161,13 +157,12 @@ test-suite spec
161
157
162 -- Additonal dependencies
158 -- Additonal dependencies
163 build-depends:
159 build-depends:
164− aeson-compat >= 0.3.8 && < 0.4
165− , hspec >= 2.5.4 && < 2.6
160+ hspec >= 2.6.0 && < 2.7
166 , QuickCheck >= 2.12.6.1 && < 2.13
161 , QuickCheck >= 2.12.6.1 && < 2.13
167 , quickcheck-instances >= 0.3.19 && < 0.4
162 , quickcheck-instances >= 0.3.19 && < 0.4
168
163
169 build-tool-depends:
164 build-tool-depends:
170− hspec-discover:hspec-discover >= 2.5.4 && < 2.6
165+ hspec-discover:hspec-discover >= 2.6.0 && < 2.7
171
166
172test-suite doctests
167test-suite doctests
173 build-depends:
168 build-depends:
@@ -177,7 +172,7 @@ test-suite doctests
177
172
178 -- We test Links failure with doctest, so we need extra dependencies
173 -- We test Links failure with doctest, so we need extra dependencies
179 build-depends:
174 build-depends:
180− hspec >= 2.5.4 && < 2.6
175+ hspec >= 2.6.0 && < 2.7
181
176
182 type: exitcode-stdio-1.0
177 type: exitcode-stdio-1.0
183 main-is: test/doctests.hs
178 main-is: test/doctests.hs
servant/test/Servant/API/ContentTypesSpec.hs+2−1
@@ -10,7 +10,8 @@ module Servant.API.ContentTypesSpec where
10import Prelude ()
10import Prelude ()
11import Prelude.Compat
11import Prelude.Compat
12
12
13−import Data.Aeson.Compat
13+import Data.Aeson
14+ (FromJSON, ToJSON (..), Value, decode, encode, object, (.=))
14import Data.ByteString.Char8
15import Data.ByteString.Char8
15 (ByteString, append, pack)
16 (ByteString, append, pack)
16import qualified Data.ByteString.Lazy as BSL
17import qualified Data.ByteString.Lazy as BSL
stack.yaml+13−5
@@ -16,10 +16,18 @@ packages:
16# - doc/tutorial/
16# - doc/tutorial/
17
17
18extra-deps:
18extra-deps:
19+- base-compat-0.10.5
20+- conduit-1.3.1
19- generics-sop-0.4.0.1
21- generics-sop-0.4.0.1
22+- hspec-2.6.0
20−- sop-core-0.4.0.0
23+- hspec-core-2.6.0
21−- QuickCheck-2.12.6.1
24+- hspec-discover-2.6.0
25+- http-api-data-0.3.10
26+- http-media-0.7.1.3
22- network-2.8.0.0
27- network-2.8.0.0
23−- hspec-2.5.8
28+- pipes-safe-2.3.1
24−- hspec-core-2.5.8
29+- QuickCheck-2.12.6.1
25−- hspec-discover-2.5.8
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