git.iko.soy/typeable/servant
on master help sign in
Allow base-compat-0.10.0
2214663Oleg Grenrus
servant-client-core/CHANGELOG.md+6
@@ -1,6 +1,12 @@
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client-core/CHANGELOG.md)
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client-core/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+
9+
40.13
100.13
5----
11----
6
12
servant-client-core/servant-client-core.cabal+2−3
@@ -1,6 +1,5 @@
1name: servant-client-core
1name: servant-client-core
2−version: 0.13
2+version: 0.13.0.1
3−x-revision: 1
4synopsis: Core functionality and class for client function generation for servant APIs
3synopsis: Core functionality and class for client function generation for servant APIs
5description:
4description:
6 This library provides backend-agnostic generation of client functions. For
5 This library provides backend-agnostic generation of client functions. For
@@ -64,7 +63,7 @@ library
64 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
63 -- 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.
64 -- Here can be exceptions if we really need features from the newer versions.
66 build-depends:
65 build-depends:
67− base-compat >= 0.9.3 && < 0.10
66+ base-compat >= 0.9.3 && < 0.11
68 , base64-bytestring >= 1.0.0.1 && < 1.1
67 , base64-bytestring >= 1.0.0.1 && < 1.1
69 , exceptions >= 0.8.3 && < 0.11
68 , exceptions >= 0.8.3 && < 0.11
70 , generics-sop >= 0.3.1.0 && < 0.4
69 , generics-sop >= 0.3.1.0 && < 0.4
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+1−1
@@ -21,8 +21,8 @@ import Control.Concurrent (newMVar, modifyMVar)
21import Data.Foldable (toList)
21import Data.Foldable (toList)
22import qualified Data.ByteString.Lazy as BL
22import qualified Data.ByteString.Lazy as BL
23import Data.List (foldl')
23import Data.List (foldl')
24−import Data.Monoid ((<>))
25import Data.Proxy (Proxy (Proxy))
24import Data.Proxy (Proxy (Proxy))
25+import Data.Semigroup ((<>))
26import Data.Sequence (fromList)
26import Data.Sequence (fromList)
27import Data.String (fromString)
27import Data.String (fromString)
28import Data.Text (Text, pack)
28import Data.Text (Text, pack)
servant-client/servant-client.cabal+6−2
@@ -1,6 +1,6 @@
1name: servant-client
1name: servant-client
2version: 0.13
2version: 0.13
3−x-revision: 1
3+x-revision: 2
4synopsis: automatical derivation of querying functions for servant webservices
4synopsis: automatical derivation of querying functions for servant webservices
5description:
5description:
6 This library lets you derive automatically Haskell functions that
6 This library lets you derive automatically Haskell functions that
@@ -62,7 +62,7 @@ library
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.2.3.0 && < 1.4
64 aeson >= 1.2.3.0 && < 1.4
65− , base-compat >= 0.9.3 && < 0.10
65+ , base-compat >= 0.9.3 && < 0.11
66 , attoparsec >= 0.13.2.0 && < 0.14
66 , attoparsec >= 0.13.2.0 && < 0.14
67 , http-client >= 0.5.7.1 && < 0.6
67 , http-client >= 0.5.7.1 && < 0.6
68 , http-client-tls >= 0.3.5.1 && < 0.4
68 , http-client-tls >= 0.3.5.1 && < 0.4
@@ -112,6 +112,10 @@ test-suite spec
112 , wai
112 , wai
113 , warp
113 , warp
114
114
115+ if !impl(ghc >= 8.0)
116+ build-depends:
117+ semigroups
118+
115 -- Additonal dependencies
119 -- Additonal dependencies
116 build-depends:
120 build-depends:
117 deepseq >= 1.3.0.2 && < 1.5
121 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−2
@@ -1,6 +1,6 @@
1name: servant-docs
1name: servant-docs
2version: 0.11.2
2version: 0.11.2
3−x-revision: 1
3+x-revision: 2
4synopsis: generate API docs for your servant webservice
4synopsis: generate API docs for your servant webservice
5description:
5description:
6 Library for generating API docs from a servant API definition.
6 Library for generating API docs from a servant API definition.
@@ -60,7 +60,7 @@ library
60 build-depends:
60 build-depends:
61 aeson >= 1.2.3.0 && < 1.4
61 aeson >= 1.2.3.0 && < 1.4
62 , aeson-pretty >= 0.8.5 && < 0.9
62 , aeson-pretty >= 0.8.5 && < 0.9
63− , base-compat >= 0.9.3 && < 0.10
63+ , base-compat >= 0.9.3 && < 0.11
64 , case-insensitive >= 1.2.0.10 && < 1.3
64 , case-insensitive >= 1.2.0.10 && < 1.3
65 , control-monad-omega >= 0.3.1 && < 0.4
65 , control-monad-omega >= 0.3.1 && < 0.4
66 , hashable >= 1.2.6.1 && < 1.3
66 , hashable >= 1.2.6.1 && < 1.3
servant-foreign/servant-foreign.cabal+2−1
@@ -1,5 +1,6 @@
1name: servant-foreign
1name: servant-foreign
2version: 0.11.1
2version: 0.11.1
3+x-revision: 1
3synopsis: Helpers for generating clients for servant APIs in any programming language
4synopsis: Helpers for generating clients for servant APIs in any programming language
4description:
5description:
5 Helper types and functions for generating client functions for servant APIs in any programming language
6 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -57,7 +58,7 @@ library
57 -- 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.
58 -- 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.
59 build-depends:
60 build-depends:
60− base-compat >= 0.9.3 && <0.10
61+ base-compat >= 0.9.3 && <0.11
61 , lens >= 4.15.4 && <4.17
62 , lens >= 4.15.4 && <4.17
62 , http-types >= 0.12 && < 0.13
63 , http-types >= 0.12 && < 0.13
63
64
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−3
@@ -1,6 +1,5 @@
1name: servant-server
1name: servant-server
2−version: 0.13
2+version: 0.13.0.1
3−x-revision: 1
4synopsis: A family of combinators for defining webservices APIs and serving them
3synopsis: A family of combinators for defining webservices APIs and serving them
5description:
4description:
6 A family of combinators for defining webservices APIs and serving them
5 A family of combinators for defining webservices APIs and serving them
@@ -70,6 +69,10 @@ library
70 , transformers >= 0.3.0.0 && < 0.6
69 , transformers >= 0.3.0.0 && < 0.6
71 , filepath >= 1.3.0.2 && < 1.5
70 , filepath >= 1.3.0.2 && < 1.5
72
71
72+ if !impl(ghc >= 8.0)
73+ build-depends:
74+ semigroups >= 0.18.3 && < 0.19
75+
73 -- Servant dependencies
76 -- Servant dependencies
74 build-depends:
77 build-depends:
75 servant == 0.13.*
78 servant == 0.13.*
@@ -78,7 +81,7 @@ library
78 -- Here can be exceptions if we really need features from the newer versions.
81 -- Here can be exceptions if we really need features from the newer versions.
79 build-depends:
82 build-depends:
80 aeson >= 1.2.3.0 && < 1.4
83 aeson >= 1.2.3.0 && < 1.4
81− , base-compat >= 0.9.3 && < 0.10
84+ , base-compat >= 0.9.3 && < 0.11
82 , attoparsec >= 0.13.2.0 && < 0.14
85 , attoparsec >= 0.13.2.0 && < 0.14
83 , base64-bytestring >= 1.0.0.1 && < 1.1
86 , base64-bytestring >= 1.0.0.1 && < 1.1
84 , exceptions >= 0.8.3 && < 0.11
87 , 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−4
@@ -1,6 +1,5 @@
1name: servant
1name: servant
2−version: 0.13
2+version: 0.13.0.1
3−x-revision: 1
4synopsis: A family of combinators for defining webservices APIs
3synopsis: A family of combinators for defining webservices APIs
5description:
4description:
6 A family of combinators for defining webservices APIs and serving them
5 A family of combinators for defining webservices APIs and serving them
@@ -82,8 +81,8 @@ library
82
81
83 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
82 -- 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.
83 -- Here can be exceptions if we really need features from the newer versions.
85− build-depends:
84+ build-depends:
86− base-compat >= 0.9.3 && < 0.10
85+ base-compat >= 0.9.3 && < 0.11
87 , aeson >= 1.2.3.0 && < 1.4
86 , aeson >= 1.2.3.0 && < 1.4
88 , attoparsec >= 0.13.2.0 && < 0.14
87 , attoparsec >= 0.13.2.0 && < 0.14
89 , case-insensitive >= 1.2.0.10 && < 1.3
88 , case-insensitive >= 1.2.0.10 && < 1.3
servant/src/Servant/Utils/Links.hs+1−1
@@ -101,7 +101,7 @@ module Servant.Utils.Links (
101) where
101) where
102
102
103import Data.List
103import Data.List
104−import Data.Monoid.Compat ( (<>) )
104+import Data.Semigroup ((<>))
105import Data.Proxy ( Proxy(..) )
105import Data.Proxy ( Proxy(..) )
106import Data.Singletons.Bool ( SBool (..), SBoolI (..) )
106import Data.Singletons.Bool ( SBool (..), SBoolI (..) )
107import qualified Data.Text as Text
107import qualified Data.Text as Text