From 764eb6d007c2a33fa65b9214598195a529314d30 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 14 Aug 2022 07:54:53 -0500 Subject: [PATCH] Fix mtl-2.3 compat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Martin Beták --- openapi3.cabal | 4 ++-- src/Data/OpenApi/Declare.hs | 1 - src/Data/OpenApi/Internal/Schema.hs | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openapi3.cabal b/openapi3.cabal index 6cae41f8..10973e49 100644 --- a/openapi3.cabal +++ b/openapi3.cabal @@ -66,10 +66,10 @@ library , containers >=0.5.11.0 && <0.7 , template-haskell >=2.13.0.0 && <2.20 , time >=1.8.0.2 && <1.14 - , transformers >=0.5.5.0 && <0.6 + , transformers >=0.5.5.0 && <0.7 build-depends: - mtl >=2.2.2 && <2.3 + mtl >=2.2.2 && <2.4 , text >=1.2.3.1 && <2.1 -- other dependencies diff --git a/src/Data/OpenApi/Declare.hs b/src/Data/OpenApi/Declare.hs index 559009a2..a302bb0a 100644 --- a/src/Data/OpenApi/Declare.hs +++ b/src/Data/OpenApi/Declare.hs @@ -16,7 +16,6 @@ import Prelude.Compat import Control.Monad import Control.Monad.Cont (ContT) -import Control.Monad.List (ListT) import Control.Monad.Reader (ReaderT) import Control.Monad.Trans import Control.Monad.Trans.Except (ExceptT) diff --git a/src/Data/OpenApi/Internal/Schema.hs b/src/Data/OpenApi/Internal/Schema.hs index f8649640..bd2013ac 100644 --- a/src/Data/OpenApi/Internal/Schema.hs +++ b/src/Data/OpenApi/Internal/Schema.hs @@ -28,7 +28,7 @@ import Control.Lens hiding (allOf) import Data.Data.Lens (template) import Control.Monad -import Control.Monad.Writer +import Control.Monad.Writer hiding (First, Last) import Data.Aeson (Object (..), SumEncoding (..), ToJSON (..), ToJSONKey (..), ToJSONKeyFunction (..), Value (..)) import Data.Char @@ -50,6 +50,7 @@ import Data.Proxy import Data.Scientific (Scientific) import Data.Fixed (Fixed, HasResolution, Pico) import Data.Set (Set) +import Data.Semigroup import qualified Data.Text as T import qualified Data.Text.Lazy as TL import Data.Time