summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphadej <>2018-04-11 08:12:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-04-11 08:12:00 (GMT)
commit99ae6b104c1f85a34e5fb26856f6ed55a0ed5a41 (patch)
tree87e01f46a64b7dd320c1fb438ce310da715b8c0b
parent13b0bdba1ee8e28afa5ceaf10ab226838880eebd (diff)
version 0.13.0.10.13.0.1
-rw-r--r--CHANGELOG.md5
-rw-r--r--servant.cabal29
-rw-r--r--src/Servant/Utils/Links.hs2
3 files changed, 21 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7449e4..b623704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
----
diff --git a/servant.cabal b/servant.cabal
index c882067..ef3da37 100644
--- a/servant.cabal
+++ b/servant.cabal
@@ -1,5 +1,5 @@
name: servant
-version: 0.13
+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
@@ -18,10 +18,11 @@ category: Servant, Web
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
@@ -69,7 +70,7 @@ library
--
-- 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
, mtl >= 2.1 && < 2.3
, text >= 1.2.3.0 && < 1.3
@@ -80,13 +81,13 @@ 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
- , aeson >= 1.2.3.0 && < 1.3
+ 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
, 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
, natural-transformation >= 0.4 && < 0.5
, mmorph >= 1.1.0 && < 1.2
@@ -153,22 +154,22 @@ test-suite spec
-- Additonal dependencies
build-depends:
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-instances >= 0.3.16 && < 0.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
- , doctest >= 0.13.0 && <0.14
+ , doctest >= 0.13.0 && <0.16
-- We test Links failure with doctest, so we need extra dependencies
build-depends:
- hspec >= 2.4.4 && < 2.5
+ hspec >= 2.4.4 && < 2.6
type: exitcode-stdio-1.0
main-is: test/doctests.hs
diff --git a/src/Servant/Utils/Links.hs b/src/Servant/Utils/Links.hs
index 65c4686..37098f0 100644
--- a/src/Servant/Utils/Links.hs
+++ b/src/Servant/Utils/Links.hs
@@ -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