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

Merge pull request #943 from phadej/bounds-backports

Browse source 
Bounds backports
This commit is contained in:
Oleg Grenrus 2018-04-11 12:12:27 +03:00 committed by GitHub
commit 680820c98c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 67 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,11 @@
changing the monad in which client functions run. changing the monad in which client functions run.
([#936](https://github.com/haskell-servant/servant/pull/936)) ([#936](https://github.com/haskell-servant/servant/pull/936))
0.13.0.1
--------
- Support `base-compat-0.10`
0.13 0.13
---- ----

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

@ -64,7 +64,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- 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. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.9.3 && < 0.10 base-compat >= 0.9.3 && < 0.11
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11 , exceptions >= 0.8.3 && < 0.11
, free >= 5.0.1 && < 5.1 , free >= 5.0.1 && < 5.1
@ -98,8 +98,8 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
deepseq >= 1.3.0.2 && <1.5 deepseq >= 1.3.0.2 && <1.5
, hspec >= 2.4.4 && <2.5 , hspec >= 2.4.4 && <2.6
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.10.1 && < 2.12
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && <2.5 hspec-discover:hspec-discover >= 2.4.4 && <2.6

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

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

5
servant-client/CHANGELOG.md
View file

@ -8,6 +8,11 @@
client functions run. client functions run.
([#936](https://github.com/haskell-servant/servant/pull/936)) ([#936](https://github.com/haskell-servant/servant/pull/936))
0.13.0.1
--------
- Support `base-compat-0.10`
0.13 0.13
---- ----

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

@ -1,5 +1,5 @@
name: servant-client name: servant-client
version: 0.13 version: 0.13.0.1
synopsis: automatical derivation of querying functions for servant webservices synopsis: automatical derivation of querying functions for servant webservices
description: description:
This library lets you derive automatically Haskell functions that This library lets you derive automatically Haskell functions that
@ -60,7 +60,7 @@ library
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
aeson >= 1.2.3.0 && < 1.4 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 , attoparsec >= 0.13.2.0 && < 0.14
, http-client >= 0.5.7.1 && < 0.6 , http-client >= 0.5.7.1 && < 0.6
, http-client-tls >= 0.3.5.1 && < 0.4 , http-client-tls >= 0.3.5.1 && < 0.4
@ -71,7 +71,7 @@ library
, semigroupoids >= 5.2.1 && < 5.3 , semigroupoids >= 5.2.1 && < 5.3
, stm >= 2.4.4.1 && < 2.5 , stm >= 2.4.4.1 && < 2.5
, transformers-base >= 0.4.4 && < 0.5 , transformers-base >= 0.4.4 && < 0.5
, transformers-compat >= 0.5.1 && < 0.6 , transformers-compat >= 0.5.1 && < 0.7
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
@ -110,11 +110,15 @@ test-suite spec
, wai , wai
, warp , warp
if !impl(ghc >= 8.0)
build-depends:
semigroups
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
deepseq >= 1.3.0.2 && < 1.5 deepseq >= 1.3.0.2 && < 1.5
, generics-sop >= 0.3.1.0 && < 0.4 , generics-sop >= 0.3.1.0 && < 0.4
, hspec >= 2.4.4 && < 2.5 , hspec >= 2.4.4 && < 2.6
, HUnit >= 1.6 && < 1.7 , HUnit >= 1.6 && < 1.7
, random-bytestring >= 0.1 && < 0.2 , random-bytestring >= 0.1 && < 0.2
, network >= 2.6.3.2 && < 2.7 , network >= 2.6.3.2 && < 2.7
@ -123,4 +127,4 @@ test-suite spec
, servant-server == 0.13.* , servant-server == 0.13.*
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.5 hspec-discover:hspec-discover >= 2.4.4 && < 2.6

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

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

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

@ -1,5 +1,6 @@
name: servant-docs name: servant-docs
version: 0.11.2 version: 0.11.2
x-revision: 2
synopsis: generate API docs for your servant webservice synopsis: generate API docs for your servant webservice
description: description:
Library for generating API docs from a servant API definition. Library for generating API docs from a servant API definition.
@ -58,7 +59,7 @@ library
build-depends: build-depends:
aeson >= 1.2.3.0 && < 1.4 aeson >= 1.2.3.0 && < 1.4
, aeson-pretty >= 0.8.5 && < 0.9 , 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 , case-insensitive >= 1.2.0.10 && < 1.3
, control-monad-omega >= 0.3.1 && < 0.4 , control-monad-omega >= 0.3.1 && < 0.4
, hashable >= 1.2.6.1 && < 1.3 , hashable >= 1.2.6.1 && < 1.3
@ -108,7 +109,7 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
hspec >= 2.4.4 && < 2.5 hspec >= 2.4.4 && < 2.6
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >=2.4.4 && <2.5 hspec-discover:hspec-discover >=2.4.4 && <2.6

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

@ -1,5 +1,5 @@
name: servant-foreign name: servant-foreign
version: 0.11 version: 0.11.1
synopsis: Helpers for generating clients for servant APIs in any programming language synopsis: Helpers for generating clients for servant APIs in any programming language
description: description:
Helper types and functions for generating client functions for servant APIs in any programming language Helper types and functions for generating client functions for servant APIs in any programming language
@ -52,7 +52,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- 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. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.9.3 && <0.10 base-compat >= 0.9.3 && <0.11
, lens >= 4.15.4 && <4.17 , lens >= 4.15.4 && <4.17
, http-types >= 0.12 && < 0.13 , http-types >= 0.12 && < 0.13
@ -79,8 +79,8 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
hspec >= 2.4.4 && <2.5 hspec >= 2.4.4 && <2.6
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >=2.4.4 && <2.5 hspec-discover:hspec-discover >=2.4.4 && <2.6
default-language: Haskell2010 default-language: Haskell2010

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) [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) [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 0.13
---- ----

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

@ -1,5 +1,5 @@
name: servant-server name: servant-server
version: 0.13 version: 0.13.0.1
synopsis: A family of combinators for defining webservices APIs and serving them synopsis: A family of combinators for defining webservices APIs and serving them
description: description:
A family of combinators for defining webservices APIs and serving them A family of combinators for defining webservices APIs and serving them
@ -68,6 +68,10 @@ library
, transformers >= 0.3.0.0 && < 0.6 , transformers >= 0.3.0.0 && < 0.6
, filepath >= 1.3.0.2 && < 1.5 , filepath >= 1.3.0.2 && < 1.5
if !impl(ghc >= 8.0)
build-depends:
semigroups >= 0.18.3 && < 0.19
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
servant == 0.13.* servant == 0.13.*
@ -76,7 +80,7 @@ library
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
aeson >= 1.2.3.0 && < 1.4 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 , attoparsec >= 0.13.2.0 && < 0.14
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11 , exceptions >= 0.8.3 && < 0.11
@ -93,7 +97,7 @@ library
, resourcet >= 1.1.9 && < 1.3 , resourcet >= 1.1.9 && < 1.3
, tagged >= 0.8.5 && < 0.9 , tagged >= 0.8.5 && < 0.9
, transformers-base >= 0.4.4 && < 0.5 , transformers-base >= 0.4.4 && < 0.5
, transformers-compat >= 0.5.1 && < 0.6 , transformers-compat >= 0.5.1 && < 0.7
, wai >= 3.2.1.1 && < 3.3 , wai >= 3.2.1.1 && < 3.3
, wai-app-static >= 3.1.6.1 && < 3.2 , wai-app-static >= 3.1.6.1 && < 3.2
, warp >= 3.2.13 && < 3.3 , warp >= 3.2.13 && < 3.3
@ -164,22 +168,22 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
directory >= 1.2.1.0 && < 1.4 directory >= 1.2.1.0 && < 1.4
, hspec >= 2.4.4 && < 2.5 , hspec >= 2.4.4 && < 2.6
, hspec-wai >= 0.9 && < 0.10 , hspec-wai >= 0.9 && < 0.10
, should-not-typecheck >= 2.1.0 && < 2.2 , should-not-typecheck >= 2.1.0 && < 2.2
, parsec >= 3.1.11 && < 3.2 , parsec >= 3.1.11 && < 3.2
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.10.1 && < 2.12
, wai-extra >= 3.0.21.0 && < 3.1 , wai-extra >= 3.0.21.0 && < 3.1
, temporary >= 1.2.0.3 && < 1.3 , temporary >= 1.2.0.3 && < 1.4
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >=2.4.4 && <2.5 hspec-discover:hspec-discover >=2.4.4 && <2.6
test-suite doctests test-suite doctests
build-depends: build-depends:
base base
, servant-server , servant-server
, doctest >= 0.13.0 && <0.14 , doctest >= 0.13.0 && <0.16
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: test/doctests.hs main-is: test/doctests.hs
buildable: True buildable: True

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, import Data.Maybe (fromMaybe, mapMaybe,
isNothing, maybeToList) isNothing, maybeToList)
import Data.Either (partitionEithers) import Data.Either (partitionEithers)
import Data.Semigroup ((<>))
import Data.String (IsString (..)) import Data.String (IsString (..))
import Data.String.Conversions (cs, (<>)) import Data.String.Conversions (cs)
import Data.Tagged (Tagged(..), retag, untag) import Data.Tagged (Tagged(..), retag, untag)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Typeable 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) [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 0.13
---- ----

14
servant/servant.cabal
View file

@ -1,5 +1,5 @@
name: servant name: servant
version: 0.13 version: 0.13.0.1
synopsis: A family of combinators for defining webservices APIs synopsis: A family of combinators for defining webservices APIs
description: description:
A family of combinators for defining webservices APIs and serving them A family of combinators for defining webservices APIs and serving them
@ -80,8 +80,8 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- 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. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.9.3 && < 0.10 base-compat >= 0.9.3 && < 0.11
, aeson >= 1.2.3.0 && < 1.4 , aeson >= 1.2.3.0 && < 1.4
, attoparsec >= 0.13.2.0 && < 0.14 , attoparsec >= 0.13.2.0 && < 0.14
, case-insensitive >= 1.2.0.10 && < 1.3 , case-insensitive >= 1.2.0.10 && < 1.3
@ -153,22 +153,22 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
aeson-compat >= 0.3.3 && < 0.4 aeson-compat >= 0.3.3 && < 0.4
, hspec >= 2.4.4 && < 2.5 , hspec >= 2.4.4 && < 2.6
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.10.1 && < 2.12
, quickcheck-instances >= 0.3.16 && < 0.4 , quickcheck-instances >= 0.3.16 && < 0.4
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.5 hspec-discover:hspec-discover >= 2.4.4 && < 2.6
test-suite doctests test-suite doctests
build-depends: build-depends:
base base
, servant , servant
, doctest >= 0.13.0 && <0.14 , doctest >= 0.13.0 && <0.16
-- We test Links failure with doctest, so we need extra dependencies -- We test Links failure with doctest, so we need extra dependencies
build-depends: build-depends:
hspec >= 2.4.4 && < 2.5 hspec >= 2.4.4 && < 2.6
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: test/doctests.hs main-is: test/doctests.hs

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

@ -101,14 +101,16 @@ module Servant.Utils.Links (
) where ) where
import Data.List import Data.List
import Data.Monoid.Compat
((<>))
import Data.Proxy import Data.Proxy
(Proxy (..)) (Proxy (..))
import Data.Semigroup
((<>))
import Data.Singletons.Bool import Data.Singletons.Bool
(SBool (..), SBoolI (..)) (SBool (..), SBoolI (..))
import qualified Data.Text as Text import qualified Data.Text as Text
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import Data.Type.Bool
(If)
import Data.Type.Bool import Data.Type.Bool
(If) (If)
import GHC.TypeLits import GHC.TypeLits