diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml index 8355396..260984d 100644 --- a/CHANGELOG.yaml +++ b/CHANGELOG.yaml @@ -1,5 +1,13 @@ releases: + - version: "0.0.7.0" + changes: + + - description: Support for base-compat-0.10 + issue: none + authors: phadej + date: 2018-04-12 + - version: "0.0.7.0" changes: diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index d4cb383..d091533 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -1,5 +1,5 @@ name: servant-quickcheck -version: 0.0.7.0 +version: 0.0.7.1 synopsis: QuickCheck entire APIs description: This packages provides QuickCheck properties that are tested across an entire @@ -37,7 +37,7 @@ library , Servant.QuickCheck.Internal.Equality , Servant.QuickCheck.Internal.ErrorTypes build-depends: base >=4.8 && <4.12 - , base-compat == 0.9.* + , base-compat-batteries >= 0.10.1 && <0.11 , aeson > 0.8 && < 2 , bytestring == 0.10.* , case-insensitive == 1.2.* @@ -56,7 +56,7 @@ library , servant-server >= 0.13 && < 0.14 , split == 0.2.* , string-conversions > 0.3 && < 0.5 - , temporary == 1.2.* + , temporary >= 1.2 && <1.4 , text == 1.* , time >= 1.5 && < 1.9 , warp >= 3.2.4 && < 3.3 diff --git a/src/Servant/QuickCheck/Internal/ErrorTypes.hs b/src/Servant/QuickCheck/Internal/ErrorTypes.hs index f95e4b2..1ec98ea 100644 --- a/src/Servant/QuickCheck/Internal/ErrorTypes.hs +++ b/src/Servant/QuickCheck/Internal/ErrorTypes.hs @@ -11,11 +11,7 @@ import qualified Network.HTTP.Client as C import Network.HTTP.Types (Header, statusCode) import Text.PrettyPrint -#if MIN_VERSION_base(4,11,0) import Prelude.Compat hiding ((<>)) -#else -import Prelude.Compat -#endif data PredicateFailure = PredicateFailure T.Text (Maybe C.Request) (C.Response LBS.ByteString) diff --git a/src/Servant/QuickCheck/Internal/HasGenRequest.hs b/src/Servant/QuickCheck/Internal/HasGenRequest.hs index 5f945ee..81fede8 100644 --- a/src/Servant/QuickCheck/Internal/HasGenRequest.hs +++ b/src/Servant/QuickCheck/Internal/HasGenRequest.hs @@ -2,7 +2,6 @@ {-# LANGUAGE PolyKinds #-} module Servant.QuickCheck.Internal.HasGenRequest where -import Data.Monoid ((<>)) import Data.String (fromString) import Data.String.Conversions (cs) import GHC.TypeLits (KnownSymbol, Nat, symbolVal)