git.iko.soy/typeable/servant
on master help sign in
Allow base-compat-0.10.0
dd7ec1dOleg Grenrus
servant-client-core/CHANGELOG.md+5
@@ -8,6 +8,11 @@
8 changing the monad in which client functions run.
8 changing the monad in which client functions run.
9 ([#936](https://github.com/haskell-servant/servant/pull/936))
9 ([#936](https://github.com/haskell-servant/servant/pull/936))
10
10
11+0.13.0.1
12+--------
13+
14+- Support `base-compat-0.10`
15+
110.13
160.13
12----
17----
13
18
servant-client-core/servant-client-core.cabal+1−1
@@ -64,7 +64,7 @@ library
64 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
64 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
65 -- Here can be exceptions if we really need features from the newer versions.
65 -- Here can be exceptions if we really need features from the newer versions.
66 build-depends:
66 build-depends:
67− base-compat >= 0.9.3 && < 0.10
67+ base-compat >= 0.9.3 && < 0.11
68 , base64-bytestring >= 1.0.0.1 && < 1.1
68 , base64-bytestring >= 1.0.0.1 && < 1.1
69 , exceptions >= 0.8.3 && < 0.11
69 , exceptions >= 0.8.3 && < 0.11
70 , free >= 5.0.1 && < 5.1
70 , free >= 5.0.1 && < 5.1
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+1−1
@@ -22,8 +22,8 @@ import Control.Concurrent (newMVar, modifyMVar)
22import Data.Foldable (toList)
22import Data.Foldable (toList)
23import qualified Data.ByteString.Lazy as BL
23import qualified Data.ByteString.Lazy as BL
24import Data.List (foldl')
24import Data.List (foldl')
25−import Data.Monoid ((<>))
26import Data.Proxy (Proxy (Proxy))
25import Data.Proxy (Proxy (Proxy))
26+import Data.Semigroup ((<>))
27import Data.Sequence (fromList)
27import Data.Sequence (fromList)
28import Data.String (fromString)
28import Data.String (fromString)
29import Data.Text (Text, pack)
29import Data.Text (Text, pack)
servant-client/servant-client.cabal+6−1
@@ -1,5 +1,6 @@
1name: servant-client
1name: servant-client
2version: 0.13
2version: 0.13
3+x-revision: 2
3synopsis: automatical derivation of querying functions for servant webservices
4synopsis: automatical derivation of querying functions for servant webservices
4description:
5description:
5 This library lets you derive automatically Haskell functions that
6 This library lets you derive automatically Haskell functions that
@@ -60,7 +61,7 @@ library
60 -- Here can be exceptions if we really need features from the newer versions.
61 -- Here can be exceptions if we really need features from the newer versions.
61 build-depends:
62 build-depends:
62 aeson >= 1.2.3.0 && < 1.4
63 aeson >= 1.2.3.0 && < 1.4
63− , base-compat >= 0.9.3 && < 0.10
64+ , base-compat >= 0.9.3 && < 0.11
64 , attoparsec >= 0.13.2.0 && < 0.14
65 , attoparsec >= 0.13.2.0 && < 0.14
65 , http-client >= 0.5.7.1 && < 0.6
66 , http-client >= 0.5.7.1 && < 0.6
66 , http-client-tls >= 0.3.5.1 && < 0.4
67 , http-client-tls >= 0.3.5.1 && < 0.4
@@ -110,6 +111,10 @@ test-suite spec
110 , wai
111 , wai
111 , warp
112 , warp
112
113
114+ if !impl(ghc >= 8.0)
115+ build-depends:
116+ semigroups
117+
113 -- Additonal dependencies
118 -- Additonal dependencies
114 build-depends:
119 build-depends:
115 deepseq >= 1.3.0.2 && < 1.5
120 deepseq >= 1.3.0.2 && < 1.5
servant-client/test/Servant/ClientSpec.hs+2−1
@@ -37,7 +37,8 @@ import Control.Monad.Error.Class (throwError)
37import Data.Aeson
37import Data.Aeson
38import Data.Char (chr, isPrint)
38import Data.Char (chr, isPrint)
39import Data.Foldable (forM_)
39import Data.Foldable (forM_)
40−import Data.Monoid hiding (getLast)
40+import Data.Semigroup ((<>))
41+import Data.Monoid ()
41import Data.Proxy
42import Data.Proxy
42import qualified Generics.SOP as SOP
43import qualified Generics.SOP as SOP
43import GHC.Generics (Generic)
44import GHC.Generics (Generic)
servant-docs/servant-docs.cabal+2−1
@@ -1,5 +1,6 @@
1name: servant-docs
1name: servant-docs
2version: 0.11.2
2version: 0.11.2
3+x-revision: 2
3synopsis: generate API docs for your servant webservice
4synopsis: generate API docs for your servant webservice
4description:
5description:
5 Library for generating API docs from a servant API definition.
6 Library for generating API docs from a servant API definition.
@@ -58,7 +59,7 @@ library
58 build-depends:
59 build-depends:
59 aeson >= 1.2.3.0 && < 1.4
60 aeson >= 1.2.3.0 && < 1.4
60 , aeson-pretty >= 0.8.5 && < 0.9
61 , aeson-pretty >= 0.8.5 && < 0.9
61− , base-compat >= 0.9.3 && < 0.10
62+ , base-compat >= 0.9.3 && < 0.11
62 , case-insensitive >= 1.2.0.10 && < 1.3
63 , case-insensitive >= 1.2.0.10 && < 1.3
63 , control-monad-omega >= 0.3.1 && < 0.4
64 , control-monad-omega >= 0.3.1 && < 0.4
64 , hashable >= 1.2.6.1 && < 1.3
65 , hashable >= 1.2.6.1 && < 1.3
servant-foreign/servant-foreign.cabal+2−2
@@ -1,5 +1,5 @@
1name: servant-foreign
1name: servant-foreign
2−version: 0.11
2+version: 0.11.1
3synopsis: Helpers for generating clients for servant APIs in any programming language
3synopsis: Helpers for generating clients for servant APIs in any programming language
4description:
4description:
5 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
@@ -52,7 +52,7 @@ library
52 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
52 -- 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.
53 -- Here can be exceptions if we really need features from the newer versions.
54 build-depends:
54 build-depends:
55− base-compat >= 0.9.3 && <0.10
55+ base-compat >= 0.9.3 && <0.11
56 , lens >= 4.15.4 && <4.17
56 , lens >= 4.15.4 && <4.17
57 , http-types >= 0.12 && < 0.13
57 , http-types >= 0.12 && < 0.13
58
58
servant-server/CHANGELOG.md+5
@@ -1,6 +1,11 @@
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md)
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md)
2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
3
3
4+0.13.0.1
5+--------
6+
7+- Support `base-compat-0.10`
8+
40.13
90.13
5----
10----
6
11
servant-server/servant-server.cabal+6−2
@@ -1,5 +1,5 @@
1name: servant-server
1name: servant-server
2−version: 0.13
2+version: 0.13.0.1
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
@@ -68,6 +68,10 @@ library
68 , transformers >= 0.3.0.0 && < 0.6
68 , transformers >= 0.3.0.0 && < 0.6
69 , filepath >= 1.3.0.2 && < 1.5
69 , filepath >= 1.3.0.2 && < 1.5
70
70
71+ if !impl(ghc >= 8.0)
72+ build-depends:
73+ semigroups >= 0.18.3 && < 0.19
74+
71 -- Servant dependencies
75 -- Servant dependencies
72 build-depends:
76 build-depends:
73 servant == 0.13.*
77 servant == 0.13.*
@@ -76,7 +80,7 @@ library
76 -- Here can be exceptions if we really need features from the newer versions.
80 -- Here can be exceptions if we really need features from the newer versions.
77 build-depends:
81 build-depends:
78 aeson >= 1.2.3.0 && < 1.4
82 aeson >= 1.2.3.0 && < 1.4
79− , base-compat >= 0.9.3 && < 0.10
83+ , base-compat >= 0.9.3 && < 0.11
80 , attoparsec >= 0.13.2.0 && < 0.14
84 , attoparsec >= 0.13.2.0 && < 0.14
81 , base64-bytestring >= 1.0.0.1 && < 1.1
85 , base64-bytestring >= 1.0.0.1 && < 1.1
82 , exceptions >= 0.8.3 && < 0.11
86 , exceptions >= 0.8.3 && < 0.11
servant-server/src/Servant/Server/Internal.hs+2−1
@@ -44,8 +44,9 @@ import qualified Data.ByteString.Lazy as BL
44import Data.Maybe (fromMaybe, mapMaybe,
44import Data.Maybe (fromMaybe, mapMaybe,
45 isNothing, maybeToList)
45 isNothing, maybeToList)
46import Data.Either (partitionEithers)
46import Data.Either (partitionEithers)
47+import Data.Semigroup ((<>))
47import Data.String (IsString (..))
48import Data.String (IsString (..))
48−import Data.String.Conversions (cs, (<>))
49+import Data.String.Conversions (cs)
49import Data.Tagged (Tagged(..), retag, untag)
50import Data.Tagged (Tagged(..), retag, untag)
50import qualified Data.Text as T
51import qualified Data.Text as T
51import Data.Typeable
52import Data.Typeable
servant/CHANGELOG.md+5
@@ -1,5 +1,10 @@
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
2
2
3+0.13.0.1
4+--------
5+
6+- Support `base-compat-0.10`
7+
30.13
80.13
4----
9----
5
10
servant/servant.cabal+3−3
@@ -1,5 +1,5 @@
1name: servant
1name: servant
2−version: 0.13
2+version: 0.13.0.1
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
@@ -80,8 +80,8 @@ library
80
80
81 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
81 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
82 -- Here can be exceptions if we really need features from the newer versions.
82 -- Here can be exceptions if we really need features from the newer versions.
83− build-depends:
83+ build-depends:
84− base-compat >= 0.9.3 && < 0.10
84+ base-compat >= 0.9.3 && < 0.11
85 , aeson >= 1.2.3.0 && < 1.4
85 , aeson >= 1.2.3.0 && < 1.4
86 , attoparsec >= 0.13.2.0 && < 0.14
86 , attoparsec >= 0.13.2.0 && < 0.14
87 , case-insensitive >= 1.2.0.10 && < 1.3
87 , case-insensitive >= 1.2.0.10 && < 1.3
servant/src/Servant/Utils/Links.hs+4−2
@@ -101,14 +101,16 @@ module Servant.Utils.Links (
101) where
101) where
102
102
103import Data.List
103import Data.List
104−import Data.Monoid.Compat
105− ((<>))
106import Data.Proxy
104import Data.Proxy
107 (Proxy (..))
105 (Proxy (..))
106+import Data.Semigroup
107+ ((<>))
108import Data.Singletons.Bool
108import Data.Singletons.Bool
109 (SBool (..), SBoolI (..))
109 (SBool (..), SBoolI (..))
110import qualified Data.Text as Text
110import qualified Data.Text as Text
111import qualified Data.Text.Encoding as TE
111import qualified Data.Text.Encoding as TE
112+import Data.Type.Bool
113+ (If)
112import Data.Type.Bool
114import Data.Type.Bool
113 (If)
115 (If)
114import GHC.TypeLits
116import GHC.TypeLits