git.iko.soy/servant
on master help sign in
Fix servant-client with base-compat-0.11
52408feOleg Grenrus
cabal.project−2
compare with master
unifiedsplit
@@ -38,8 +38,6 @@ packages:
38 doc/cookbook/using-free-client
38 doc/cookbook/using-free-client
39 -- doc/cookbook/open-id-connect
39 -- doc/cookbook/open-id-connect
40
40
41−
42−
43tests: True
41tests: True
44optimization: False
42optimization: False
45-- reorder-goals: True
43-- reorder-goals: True
servant-client/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-client/CHANGELOG.md)
1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/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.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
40.16
90.16
5----
10----
6
11
servant-client/servant-client.cabal+1−1
@@ -1,6 +1,6 @@
1cabal-version: >=1.10
1cabal-version: >=1.10
2name: servant-client
2name: servant-client
3−version: 0.16
3+version: 0.16.0.1
4
4
5synopsis: Automatic derivation of querying functions for servant
5synopsis: Automatic derivation of querying functions for servant
6category: Servant, Web
6category: Servant, Web
servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3
@@ -16,10 +16,11 @@ import Prelude.Compat
16
16
17import Control.Concurrent.MVar
17import Control.Concurrent.MVar
18 (modifyMVar, newMVar)
18 (modifyMVar, newMVar)
19−import qualified Data.ByteString as BS
20import Control.Concurrent.STM.TVar
19import Control.Concurrent.STM.TVar
21import Control.Exception
20import Control.Exception
21+ (SomeException (..), catch)
22import Control.Monad
22import Control.Monad
23+ (unless)
23import Control.Monad.Base
24import Control.Monad.Base
24 (MonadBase (..))
25 (MonadBase (..))
25import Control.Monad.Catch
26import Control.Monad.Catch
@@ -27,15 +28,18 @@ import Control.Monad.Catch
27import Control.Monad.Error.Class
28import Control.Monad.Error.Class
28 (MonadError (..))
29 (MonadError (..))
29import Control.Monad.IO.Class
30import Control.Monad.IO.Class
30− (liftIO)
31+ (MonadIO (..))
31import Control.Monad.Reader
32import Control.Monad.Reader
33+ (MonadReader, ReaderT, ask, runReaderT)
32import Control.Monad.STM
34import Control.Monad.STM
33 (STM, atomically)
35 (STM, atomically)
34import Control.Monad.Trans.Control
36import Control.Monad.Trans.Control
35 (MonadBaseControl (..))
37 (MonadBaseControl (..))
36import Control.Monad.Trans.Except
38import Control.Monad.Trans.Except
39+ (ExceptT, runExceptT)
37import Data.Bifunctor
40import Data.Bifunctor
38 (bimap)
41 (bimap)
42+import qualified Data.ByteString as BS
39import Data.ByteString.Builder
43import Data.ByteString.Builder
40 (toLazyByteString)
44 (toLazyByteString)
41import qualified Data.ByteString.Lazy as BSL
45import qualified Data.ByteString.Lazy as BSL
@@ -64,8 +68,8 @@ import Network.HTTP.Types
64 (hContentType, renderQuery, statusCode)
68 (hContentType, renderQuery, statusCode)
65import Servant.Client.Core
69import Servant.Client.Core
66
70
67−import qualified Servant.Types.SourceT as S
68import qualified Network.HTTP.Client as Client
71import qualified Network.HTTP.Client as Client
72+import qualified Servant.Types.SourceT as S
69
73
70-- | The environment in which a request is run.
74-- | The environment in which a request is run.
71data ClientEnv
75data ClientEnv
servant-http-streams/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-http-streams/CHANGELOG.md)
1 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/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.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
40.16
90.16
5----
10----
6
11
servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1
@@ -18,6 +18,8 @@ import Control.DeepSeq
18 (NFData, force)
18 (NFData, force)
19import Control.Exception
19import Control.Exception
20 (IOException, SomeException (..), catch, evaluate, throwIO)
20 (IOException, SomeException (..), catch, evaluate, throwIO)
21+import Control.Monad
22+ (unless)
21import Control.Monad.Base
23import Control.Monad.Base
22 (MonadBase (..))
24 (MonadBase (..))
23import Control.Monad.Codensity
25import Control.Monad.Codensity
@@ -25,9 +27,13 @@ import Control.Monad.Codensity
25import Control.Monad.Error.Class
27import Control.Monad.Error.Class
26 (MonadError (..))
28 (MonadError (..))
27import Control.Monad.IO.Class
29import Control.Monad.IO.Class
28− (liftIO)
30+ (MonadIO (..))
29import Control.Monad.Reader
31import Control.Monad.Reader
32+ (MonadReader, ReaderT, ask, runReaderT)
33+import Control.Monad.Trans.Class
34+ (lift)
30import Control.Monad.Trans.Except
35import Control.Monad.Trans.Except
36+ (ExceptT, runExceptT)
31import Data.Bifunctor
37import Data.Bifunctor
32 (bimap, first)
38 (bimap, first)
33import Data.ByteString.Builder
39import Data.ByteString.Builder