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

Merge pull request #941 from phadej/base-compat-0.10

Browse source 
Allow base-compat-0.10.0
This commit is contained in:
Oleg Grenrus 2018-04-11 09:50:07 +03:00 committed by GitHub
commit a49b53c675
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servant-client-core/CHANGELOG.md
View file

@ -1,6 +1,12 @@
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client-core/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.13.0.1
--------
- Support `base-compat-0.10`
0.13
----

5
servant-client-core/servant-client-core.cabal
View file

@ -1,6 +1,5 @@
name: servant-client-core
version: 0.13
x-revision: 1
version: 0.13.0.1
synopsis: Core functionality and class for client function generation for servant APIs
description:
This library provides backend-agnostic generation of client functions. For
@ -64,7 +63,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.9.3 && < 0.10
base-compat >= 0.9.3 && < 0.11
, base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11
, generics-sop >= 0.3.1.0 && < 0.4

2
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs
View file

@ -21,8 +21,8 @@ import Control.Concurrent (newMVar, modifyMVar)
import Data.Foldable (toList)
import qualified Data.ByteString.Lazy as BL
import Data.List (foldl')
import Data.Monoid ((<>))
import Data.Proxy (Proxy (Proxy))
import Data.Semigroup ((<>))
import Data.Sequence (fromList)
import Data.String (fromString)
import Data.Text (Text, pack)

8
servant-client/servant-client.cabal
View file

@ -1,6 +1,6 @@
name: servant-client
version: 0.13
x-revision: 1
x-revision: 2
synopsis: automatical derivation of querying functions for servant webservices
description:
This library lets you derive automatically Haskell functions that
@ -62,7 +62,7 @@ library
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
aeson >= 1.2.3.0 && < 1.4
, base-compat >= 0.9.3 && < 0.10
, base-compat >= 0.9.3 && < 0.11
, attoparsec >= 0.13.2.0 && < 0.14
, http-client >= 0.5.7.1 && < 0.6
, http-client-tls >= 0.3.5.1 && < 0.4
@ -112,6 +112,10 @@ test-suite spec
, wai
, warp
if !impl(ghc >= 8.0)
build-depends:
semigroups
-- Additonal dependencies
build-depends:
deepseq >= 1.3.0.2 && < 1.5

3
servant-client/test/Servant/ClientSpec.hs
View file

@ -37,7 +37,8 @@ import Control.Monad.Error.Class (throwError)
import Data.Aeson
import Data.Char (chr, isPrint)
import Data.Foldable (forM_)
import Data.Monoid hiding (getLast)
import Data.Semigroup ((<>))
import Data.Monoid ()
import Data.Proxy
import qualified Generics.SOP as SOP
import GHC.Generics (Generic)

4
servant-docs/servant-docs.cabal
View file

@ -1,6 +1,6 @@
name: servant-docs
version: 0.11.2
x-revision: 1
x-revision: 2
synopsis: generate API docs for your servant webservice
description:
Library for generating API docs from a servant API definition.
@ -60,7 +60,7 @@ library
build-depends:
aeson >= 1.2.3.0 && < 1.4
, aeson-pretty >= 0.8.5 && < 0.9
, base-compat >= 0.9.3 && < 0.10
, base-compat >= 0.9.3 && < 0.11
, case-insensitive >= 1.2.0.10 && < 1.3
, control-monad-omega >= 0.3.1 && < 0.4
, hashable >= 1.2.6.1 && < 1.3

3
servant-foreign/servant-foreign.cabal
View file

@ -1,5 +1,6 @@
name: servant-foreign
version: 0.11.1
x-revision: 1
synopsis: Helpers for generating clients for servant APIs in any programming language
description:
Helper types and functions for generating client functions for servant APIs in any programming language
@ -57,7 +58,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.9.3 && <0.10
base-compat >= 0.9.3 && <0.11
, lens >= 4.15.4 && <4.17
, http-types >= 0.12 && < 0.13

5
servant-server/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-server/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.13.0.1
--------
- Support `base-compat-0.10`
0.13
----

9
servant-server/servant-server.cabal
View file

@ -1,6 +1,5 @@
name: servant-server
version: 0.13
x-revision: 1
version: 0.13.0.1
synopsis: A family of combinators for defining webservices APIs and serving them
description:
A family of combinators for defining webservices APIs and serving them
@ -70,6 +69,10 @@ library
, transformers >= 0.3.0.0 && < 0.6
, filepath >= 1.3.0.2 && < 1.5
if !impl(ghc >= 8.0)
build-depends:
semigroups >= 0.18.3 && < 0.19
-- Servant dependencies
build-depends:
servant == 0.13.*
@ -78,7 +81,7 @@ library
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
aeson >= 1.2.3.0 && < 1.4
, base-compat >= 0.9.3 && < 0.10
, base-compat >= 0.9.3 && < 0.11
, attoparsec >= 0.13.2.0 && < 0.14
, base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11

3
servant-server/src/Servant/Server/Internal.hs
View file

@ -44,8 +44,9 @@ import qualified Data.ByteString.Lazy as BL
import Data.Maybe (fromMaybe, mapMaybe,
isNothing, maybeToList)
import Data.Either (partitionEithers)
import Data.Semigroup ((<>))
import Data.String (IsString (..))
import Data.String.Conversions (cs, (<>))
import Data.String.Conversions (cs)
import Data.Tagged (Tagged(..), retag, untag)
import qualified Data.Text as T
import Data.Typeable

5
servant/CHANGELOG.md
View file

@ -1,5 +1,10 @@
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
0.13.0.1
--------
- Support `base-compat-0.10`
0.13
----

7
servant/servant.cabal
View file

@ -1,6 +1,5 @@
name: servant
version: 0.13
x-revision: 1
version: 0.13.0.1
synopsis: A family of combinators for defining webservices APIs
description:
A family of combinators for defining webservices APIs and serving them
@ -82,8 +81,8 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.9.3 && < 0.10
build-depends:
base-compat >= 0.9.3 && < 0.11
, aeson >= 1.2.3.0 && < 1.4
, attoparsec >= 0.13.2.0 && < 0.14
, case-insensitive >= 1.2.0.10 && < 1.3

2
servant/src/Servant/Utils/Links.hs
View file

@ -101,7 +101,7 @@ module Servant.Utils.Links (
) where
import Data.List
import Data.Monoid.Compat ( (<>) )
import Data.Semigroup ((<>))
import Data.Proxy ( Proxy(..) )
import Data.Singletons.Bool ( SBool (..), SBoolI (..) )
import qualified Data.Text as Text