eeva
/
servant
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix servant-client with base-compat-0.11

This commit is contained in:
Oleg Grenrus 2019-09-15 14:50:55 +03:00
parent fa35b5bd70
commit 52408fea16
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cabal.project
View File

@ -38,8 +38,6 @@ packages:
doc/cookbook/using-free-client
-- doc/cookbook/open-id-connect
tests: True
optimization: False
-- reorder-goals: True

5
servant-client/CHANGELOG.md
View File

@ -1,6 +1,11 @@
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
0.16.0.1
--------
- Allow `base-compat-0.11`
0.16
----

2
servant-client/servant-client.cabal
View File

@ -1,6 +1,6 @@
cabal-version: >=1.10
name: servant-client
version: 0.16
version: 0.16.0.1
synopsis: Automatic derivation of querying functions for servant
category: Servant, Web

10
servant-client/src/Servant/Client/Internal/HttpClient.hs
View File

@ -16,10 +16,11 @@ import Prelude.Compat
import Control.Concurrent.MVar
(modifyMVar, newMVar)
import qualified Data.ByteString as BS
import Control.Concurrent.STM.TVar
import Control.Exception
(SomeException (..), catch)
import Control.Monad
(unless)
import Control.Monad.Base
(MonadBase (..))
import Control.Monad.Catch
@ -27,15 +28,18 @@ import Control.Monad.Catch
import Control.Monad.Error.Class
(MonadError (..))
import Control.Monad.IO.Class
(liftIO)
(MonadIO (..))
import Control.Monad.Reader
(MonadReader, ReaderT, ask, runReaderT)
import Control.Monad.STM
(STM, atomically)
import Control.Monad.Trans.Control
(MonadBaseControl (..))
import Control.Monad.Trans.Except
(ExceptT, runExceptT)
import Data.Bifunctor
(bimap)
import qualified Data.ByteString as BS
import Data.ByteString.Builder
(toLazyByteString)
import qualified Data.ByteString.Lazy as BSL
@ -64,8 +68,8 @@ import Network.HTTP.Types
(hContentType, renderQuery, statusCode)
import Servant.Client.Core
import qualified Servant.Types.SourceT as S
import qualified Network.HTTP.Client as Client
import qualified Servant.Types.SourceT as S
-- | The environment in which a request is run.
data ClientEnv

5
servant-http-streams/CHANGELOG.md
View File

@ -1,6 +1,11 @@
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
0.16.0.1
--------
- Allow `base-compat-0.11`
0.16
----

8
servant-http-streams/src/Servant/HttpStreams/Internal.hs
View File

@ -18,6 +18,8 @@ import Control.DeepSeq
(NFData, force)
import Control.Exception
(IOException, SomeException (..), catch, evaluate, throwIO)
import Control.Monad
(unless)
import Control.Monad.Base
(MonadBase (..))
import Control.Monad.Codensity
@ -25,9 +27,13 @@ import Control.Monad.Codensity
import Control.Monad.Error.Class
(MonadError (..))
import Control.Monad.IO.Class
(liftIO)
(MonadIO (..))
import Control.Monad.Reader
(MonadReader, ReaderT, ask, runReaderT)
import Control.Monad.Trans.Class
(lift)
import Control.Monad.Trans.Except
(ExceptT, runExceptT)
import Data.Bifunctor
(bimap, first)
import Data.ByteString.Builder