From 9378fd682f3f2b1aed134e66b0a62c43850647e9 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 12 Apr 2024 01:13:52 +0100 Subject: [PATCH] Build with ghc 9.6 --- reflex-dom-core/reflex-dom-core.cabal | 10 +++++----- reflex-dom-core/src/Reflex/Dom/Builder/Class.hs | 1 + reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs | 2 ++ reflex-dom-core/src/Reflex/Dom/Builder/Static.hs | 2 ++ reflex-dom-core/src/Reflex/Dom/Prerender.hs | 2 ++ reflex-dom-core/src/Reflex/Dom/WebSocket.hs | 3 +-- reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs | 1 + reflex-dom-core/src/Reflex/Dom/Widget/Input.hs | 1 + .../reflex-dom-test-selenium.cabal | 2 +- reflex-dom/reflex-dom.cabal | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/reflex-dom-core/reflex-dom-core.cabal b/reflex-dom-core/reflex-dom-core.cabal index 26ed8cf2..07cfc43b 100644 --- a/reflex-dom-core/reflex-dom-core.cabal +++ b/reflex-dom-core/reflex-dom-core.cabal @@ -68,7 +68,7 @@ library hs-source-dirs: src build-depends: aeson >= 0.8 && < 2.2, - base >= 4.7 && < 4.18, + base >= 4.7 && < 4.19, bifunctors >= 4.2 && < 6, bimap >= 0.3 && < 0.5, blaze-builder >= 0.4.1 && < 0.5, @@ -90,7 +90,7 @@ library keycode >= 0.2.1 && < 0.3, lens >= 4.7 && < 5.3, monad-control >= 1.0.1 && < 1.1, - mtl >= 2.1 && < 2.3, + mtl >= 2.1 && < 2.4, primitive >= 0.5 && < 0.8, random >= 1.1 && < 1.3, ref-tf >= 0.4 && < 0.6, @@ -98,7 +98,7 @@ library semigroups >= 0.16 && < 0.20, stm >= 2.4 && < 2.6, text == 1.2.*, - transformers >= 0.3 && < 0.6, + transformers >= 0.3 && < 0.7, network-uri >= 2.6.1 && < 2.7, zenc == 0.1.* @@ -114,7 +114,7 @@ library if flag(split-these) build-depends: - semialign >= 1 && < 1.3, + semialign >= 1 && < 1.4, these >= 1 && < 1.3 else build-depends: @@ -170,7 +170,7 @@ library if flag(use-template-haskell) build-depends: dependent-sum-template >= 0.1 && < 0.2, - template-haskell >= 2.12.0 && < 2.20 + template-haskell >= 2.12.0 && < 2.21 other-extensions: TemplateHaskell cpp-options: -DUSE_TEMPLATE_HASKELL other-modules: diff --git a/reflex-dom-core/src/Reflex/Dom/Builder/Class.hs b/reflex-dom-core/src/Reflex/Dom/Builder/Class.hs index fd03cbc7..dedf268a 100644 --- a/reflex-dom-core/src/Reflex/Dom/Builder/Class.hs +++ b/reflex-dom-core/src/Reflex/Dom/Builder/Class.hs @@ -47,6 +47,7 @@ import Reflex.Requester.Base import qualified Control.Category import Control.Lens hiding (element) +import Control.Monad.Fix import Control.Monad.Reader import qualified Control.Monad.State as Lazy import Control.Monad.State.Strict diff --git a/reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs b/reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs index fce08d03..031997ba 100644 --- a/reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs +++ b/reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs @@ -120,7 +120,9 @@ module Reflex.Dom.Builder.Immediate import Control.Concurrent import Control.Exception (bracketOnError) import Control.Lens (Identity(..), imapM_, iforM_, (^.), makeLenses) +import Control.Monad import Control.Monad.Exception +import Control.Monad.Fix import Control.Monad.Primitive import Control.Monad.Reader import Control.Monad.Ref diff --git a/reflex-dom-core/src/Reflex/Dom/Builder/Static.hs b/reflex-dom-core/src/Reflex/Dom/Builder/Static.hs index 140c25ae..4463ee38 100644 --- a/reflex-dom-core/src/Reflex/Dom/Builder/Static.hs +++ b/reflex-dom-core/src/Reflex/Dom/Builder/Static.hs @@ -19,6 +19,8 @@ import Data.IORef (IORef) import Blaze.ByteString.Builder.Html.Utf8 import Control.Lens hiding (element) import Control.Monad.Exception +import Control.Monad +import Control.Monad.Fix import Control.Monad.Identity import Control.Monad.Primitive import Control.Monad.Ref diff --git a/reflex-dom-core/src/Reflex/Dom/Prerender.hs b/reflex-dom-core/src/Reflex/Dom/Prerender.hs index b7e9cbda..3fbf0cb9 100644 --- a/reflex-dom-core/src/Reflex/Dom/Prerender.hs +++ b/reflex-dom-core/src/Reflex/Dom/Prerender.hs @@ -22,6 +22,8 @@ module Reflex.Dom.Prerender , PrerenderBaseConstraints ) where +import Control.Monad +import Control.Monad.Fix import Control.Monad.Primitive (PrimMonad(..)) import Control.Monad.Reader import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..)) diff --git a/reflex-dom-core/src/Reflex/Dom/WebSocket.hs b/reflex-dom-core/src/Reflex/Dom/WebSocket.hs index 13e6fedc..66b34843 100644 --- a/reflex-dom-core/src/Reflex/Dom/WebSocket.hs +++ b/reflex-dom-core/src/Reflex/Dom/WebSocket.hs @@ -40,9 +40,8 @@ import Control.Concurrent import Control.Concurrent.STM import Control.Exception import Control.Lens -import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence) +import Control.Monad hiding (forM, mapM, mapM_, sequence) import Control.Monad.IO.Class -import Control.Monad.State import Data.Aeson import Data.ByteString (ByteString) import Data.ByteString.Lazy (toStrict) diff --git a/reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs b/reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs index 66e6d5ab..c6dffa40 100644 --- a/reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs +++ b/reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs @@ -72,6 +72,7 @@ import Reflex.Workflow import Control.Arrow import Control.Lens hiding (children, element) +import Control.Monad.Fix import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_) import Data.Align import Data.Default diff --git a/reflex-dom-core/src/Reflex/Dom/Widget/Input.hs b/reflex-dom-core/src/Reflex/Dom/Widget/Input.hs index 2c67fcd3..086a8ed1 100644 --- a/reflex-dom-core/src/Reflex/Dom/Widget/Input.hs +++ b/reflex-dom-core/src/Reflex/Dom/Widget/Input.hs @@ -19,6 +19,7 @@ module Reflex.Dom.Widget.Input (module Reflex.Dom.Widget.Input, def, (&), (.~)) import Prelude import Control.Lens hiding (element, ix) +import Control.Monad import Control.Monad.Fix import Control.Monad.IO.Class import Control.Monad.Reader diff --git a/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal b/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal index abb268ac..85ae0668 100644 --- a/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal +++ b/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal @@ -15,7 +15,7 @@ library hs-source-dirs: src build-depends: async, - base >= 4.7 && < 4.18, + base >= 4.7 && < 4.19, bytestring >= 0.10 && < 0.12, chrome-test-utils, exceptions, diff --git a/reflex-dom/reflex-dom.cabal b/reflex-dom/reflex-dom.cabal index 27d747a5..92498ab8 100644 --- a/reflex-dom/reflex-dom.cabal +++ b/reflex-dom/reflex-dom.cabal @@ -71,7 +71,7 @@ library cpp-options: -DANDROID build-tools: hsc2hs build-depends: - base >= 4.7 && < 4.18, + base >= 4.7 && < 4.19, bytestring >= 0.10 && < 0.12, reflex >= 0.8 && < 1, reflex-dom-core >= 0.6.1.0 && <0.9,