servant-server 0.13 → 0.13.0.1
raw patch · 3 files changed
+27/−16 lines, 3 filesdep +semigroupsdep ~aesondep ~base-compatdep ~network
Dependencies added: semigroups
Dependency ranges changed: aeson, base-compat, network, temporary
Files
- CHANGELOG.md +5/−0
- servant-server.cabal +20/−15
- src/Servant/Server/Internal.hs +2/−1
CHANGELOG.md view
@@ -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 ----
servant-server.cabal view
@@ -1,5 +1,5 @@ name: servant-server-version: 0.13+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@@ -22,10 +22,11 @@ build-type: Custom cabal-version: >=1.10 tested-with:- GHC==7.8.4- GHC==7.10.3- GHC==8.0.2- GHC==8.2.2+ GHC==7.8.4,+ GHC==7.10.3,+ GHC==8.0.2,+ GHC==8.2.2,+ GHC==8.4.1 extra-source-files: include/*.h CHANGELOG.md@@ -60,7 +61,7 @@ -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends:- base >= 4.7 && < 4.11+ base >= 4.7 && < 4.12 , bytestring >= 0.10.4.0 && < 0.11 , containers >= 0.5.5.1 && < 0.6 , mtl >= 2.1 && < 2.3@@ -68,6 +69,10 @@ , 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.*@@ -75,13 +80,13 @@ -- 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:- aeson >= 1.2.3.0 && < 1.3- , base-compat >= 0.9.3 && < 0.10+ aeson >= 1.2.3.0 && < 1.4+ , 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.9+ , exceptions >= 0.8.3 && < 0.11 , http-api-data >= 0.3.7.1 && < 0.4- , http-media >= 0.7.1.1 && < 0.8+ , http-media >= 0.7.0 && < 0.8 , http-types >= 0.12 && < 0.13 , network-uri >= 2.6.1.0 && < 2.7 , monad-control >= 1.0.0.4 && < 1.1@@ -93,7 +98,7 @@ , resourcet >= 1.1.9 && < 1.3 , tagged >= 0.8.5 && < 0.9 , 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-app-static >= 3.1.6.1 && < 3.2 , warp >= 3.2.13 && < 3.3@@ -164,22 +169,22 @@ -- Additonal dependencies build-depends: 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 , should-not-typecheck >= 2.1.0 && < 2.2 , parsec >= 3.1.11 && < 3.2 , QuickCheck >= 2.10.1 && < 2.12 , 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:- hspec-discover:hspec-discover >=2.4.4 && <2.5+ hspec-discover:hspec-discover >=2.4.4 && <2.6 test-suite doctests build-depends: base , servant-server- , doctest >= 0.13.0 && <0.14+ , doctest >= 0.13.0 && <0.16 type: exitcode-stdio-1.0 main-is: test/doctests.hs buildable: True
src/Servant/Server/Internal.hs view
@@ -44,8 +44,9 @@ 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