From c04695c7a1e44ab6ea35b4230883cfe52a847f25 Mon Sep 17 00:00:00 2001 From: Artur Gajowy Date: Mon, 25 Sep 2023 22:15:58 +0200 Subject: [PATCH 1/2] Bump version bounds --- servant-mock.cabal | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/servant-mock.cabal b/servant-mock.cabal index efc1b74..87da664 100644 --- a/servant-mock.cabal +++ b/servant-mock.cabal @@ -39,14 +39,14 @@ library exposed-modules: Servant.Mock build-depends: - base >=4.9 && <4.14, - base-compat >=0.10.5 && <0.12, - bytestring >=0.10.8.1 && <0.11, + base >=4.9 && <4.19, + base-compat >=0.10.5 && <0.14, + bytestring >=0.10.8.1 && <0.13, http-types >=0.12.2 && <0.13, - servant >=0.17 && <0.19, - servant-server >=0.17 && <0.19, - transformers >=0.5.2.0 && <0.6, - QuickCheck >=2.12.6.1 && <2.14, + servant >=0.17 && <0.21, + servant-server >=0.17 && <0.21, + transformers >=0.5.2.0 && <0.7, + QuickCheck >=2.12.6.1 && <2.15, wai >=3.2.1.2 && <3.3 hs-source-dirs: src default-language: Haskell2010 From 2b8c945d1f66c25604ef987b2b815fb4a92e41f6 Mon Sep 17 00:00:00 2001 From: Artur Gajowy Date: Tue, 26 Sep 2023 00:02:53 +0200 Subject: [PATCH 2/2] Add Typeable constraint for GHC 9.6 --- src/Servant/Mock.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Servant/Mock.hs b/src/Servant/Mock.hs index edffc25..194e5da 100644 --- a/src/Servant/Mock.hs +++ b/src/Servant/Mock.hs @@ -63,6 +63,7 @@ import Prelude.Compat import Control.Monad.IO.Class import Data.ByteString.Lazy.Char8 (pack) import Data.Proxy +import Data.Typeable import GHC.TypeLits import Network.HTTP.Types.Status import Network.Wai @@ -118,10 +119,10 @@ instance (HasMock a context, HasMock b context) => HasMock (a :<|> b) context wh instance (KnownSymbol path, HasMock rest context) => HasMock (path :> rest) context where mock _ = mock (Proxy :: Proxy rest) -instance (KnownSymbol s, FromHttpApiData a, HasMock rest context, SBoolI (FoldLenient mods)) => HasMock (Capture' mods s a :> rest) context where +instance (KnownSymbol s, FromHttpApiData a, HasMock rest context, SBoolI (FoldLenient mods), Typeable a) => HasMock (Capture' mods s a :> rest) context where mock _ context = \_ -> mock (Proxy :: Proxy rest) context -instance (KnownSymbol s, FromHttpApiData a, HasMock rest context) => HasMock (CaptureAll s a :> rest) context where +instance (KnownSymbol s, FromHttpApiData a, HasMock rest context, Typeable a) => HasMock (CaptureAll s a :> rest) context where mock _ context = \_ -> mock (Proxy :: Proxy rest) context instance (AllCTUnrender ctypes a, HasMock rest context, SBoolI (FoldLenient mods))