Fix servant-client with base-compat-0.11
This commit is contained in:
parent
fa35b5bd70
commit
52408fea16
6 changed files with 25 additions and 7 deletions
|
@ -38,8 +38,6 @@ packages:
|
||||||
doc/cookbook/using-free-client
|
doc/cookbook/using-free-client
|
||||||
-- doc/cookbook/open-id-connect
|
-- doc/cookbook/open-id-connect
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
tests: True
|
tests: True
|
||||||
optimization: False
|
optimization: False
|
||||||
-- reorder-goals: True
|
-- reorder-goals: True
|
||||||
|
|
|
@ -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)
|
[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)
|
[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
|
0.16
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
name: servant-client
|
name: servant-client
|
||||||
version: 0.16
|
version: 0.16.0.1
|
||||||
|
|
||||||
synopsis: Automatic derivation of querying functions for servant
|
synopsis: Automatic derivation of querying functions for servant
|
||||||
category: Servant, Web
|
category: Servant, Web
|
||||||
|
|
|
@ -16,10 +16,11 @@ import Prelude.Compat
|
||||||
|
|
||||||
import Control.Concurrent.MVar
|
import Control.Concurrent.MVar
|
||||||
(modifyMVar, newMVar)
|
(modifyMVar, newMVar)
|
||||||
import qualified Data.ByteString as BS
|
|
||||||
import Control.Concurrent.STM.TVar
|
import Control.Concurrent.STM.TVar
|
||||||
import Control.Exception
|
import Control.Exception
|
||||||
|
(SomeException (..), catch)
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
|
(unless)
|
||||||
import Control.Monad.Base
|
import Control.Monad.Base
|
||||||
(MonadBase (..))
|
(MonadBase (..))
|
||||||
import Control.Monad.Catch
|
import Control.Monad.Catch
|
||||||
|
@ -27,15 +28,18 @@ import Control.Monad.Catch
|
||||||
import Control.Monad.Error.Class
|
import Control.Monad.Error.Class
|
||||||
(MonadError (..))
|
(MonadError (..))
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
(liftIO)
|
(MonadIO (..))
|
||||||
import Control.Monad.Reader
|
import Control.Monad.Reader
|
||||||
|
(MonadReader, ReaderT, ask, runReaderT)
|
||||||
import Control.Monad.STM
|
import Control.Monad.STM
|
||||||
(STM, atomically)
|
(STM, atomically)
|
||||||
import Control.Monad.Trans.Control
|
import Control.Monad.Trans.Control
|
||||||
(MonadBaseControl (..))
|
(MonadBaseControl (..))
|
||||||
import Control.Monad.Trans.Except
|
import Control.Monad.Trans.Except
|
||||||
|
(ExceptT, runExceptT)
|
||||||
import Data.Bifunctor
|
import Data.Bifunctor
|
||||||
(bimap)
|
(bimap)
|
||||||
|
import qualified Data.ByteString as BS
|
||||||
import Data.ByteString.Builder
|
import Data.ByteString.Builder
|
||||||
(toLazyByteString)
|
(toLazyByteString)
|
||||||
import qualified Data.ByteString.Lazy as BSL
|
import qualified Data.ByteString.Lazy as BSL
|
||||||
|
@ -64,8 +68,8 @@ import Network.HTTP.Types
|
||||||
(hContentType, renderQuery, statusCode)
|
(hContentType, renderQuery, statusCode)
|
||||||
import Servant.Client.Core
|
import Servant.Client.Core
|
||||||
|
|
||||||
import qualified Servant.Types.SourceT as S
|
|
||||||
import qualified Network.HTTP.Client as Client
|
import qualified Network.HTTP.Client as Client
|
||||||
|
import qualified Servant.Types.SourceT as S
|
||||||
|
|
||||||
-- | The environment in which a request is run.
|
-- | The environment in which a request is run.
|
||||||
data ClientEnv
|
data ClientEnv
|
||||||
|
|
|
@ -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)
|
[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)
|
[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
|
0.16
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@ import Control.DeepSeq
|
||||||
(NFData, force)
|
(NFData, force)
|
||||||
import Control.Exception
|
import Control.Exception
|
||||||
(IOException, SomeException (..), catch, evaluate, throwIO)
|
(IOException, SomeException (..), catch, evaluate, throwIO)
|
||||||
|
import Control.Monad
|
||||||
|
(unless)
|
||||||
import Control.Monad.Base
|
import Control.Monad.Base
|
||||||
(MonadBase (..))
|
(MonadBase (..))
|
||||||
import Control.Monad.Codensity
|
import Control.Monad.Codensity
|
||||||
|
@ -25,9 +27,13 @@ import Control.Monad.Codensity
|
||||||
import Control.Monad.Error.Class
|
import Control.Monad.Error.Class
|
||||||
(MonadError (..))
|
(MonadError (..))
|
||||||
import Control.Monad.IO.Class
|
import Control.Monad.IO.Class
|
||||||
(liftIO)
|
(MonadIO (..))
|
||||||
import Control.Monad.Reader
|
import Control.Monad.Reader
|
||||||
|
(MonadReader, ReaderT, ask, runReaderT)
|
||||||
|
import Control.Monad.Trans.Class
|
||||||
|
(lift)
|
||||||
import Control.Monad.Trans.Except
|
import Control.Monad.Trans.Except
|
||||||
|
(ExceptT, runExceptT)
|
||||||
import Data.Bifunctor
|
import Data.Bifunctor
|
||||||
(bimap, first)
|
(bimap, first)
|
||||||
import Data.ByteString.Builder
|
import Data.ByteString.Builder
|
||||||
|
|
Loading…
Reference in a new issue