diff --git a/.ghci b/.ghci deleted file mode 100644 index 630ab055..00000000 --- a/.ghci +++ /dev/null @@ -1,4 +0,0 @@ -:set -isrc - --- Since we're in GHCi, we can't be using GHCJS -:set -isrc-ghc diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index fdc57e72..8a8bbe26 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -6,7 +6,7 @@ jobs: build: strategy: matrix: - ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8', '9.10'] + ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8', '9.10', '9.12'] os: ['ubuntu-latest', 'macos-13'] # https://github.com/haskell-actions/setup/issues/77 runs-on: ${{ matrix.os }} diff --git a/reflex-dom-core/reflex-dom-core.cabal b/reflex-dom-core/reflex-dom-core.cabal index 12d973ca..00eb3c72 100644 --- a/reflex-dom-core/reflex-dom-core.cabal +++ b/reflex-dom-core/reflex-dom-core.cabal @@ -73,7 +73,7 @@ library hs-source-dirs: src build-depends: aeson >= 0.8 && < 2.3, - base >= 4.7 && < 4.21, + base >= 4.7 && < 4.22, bifunctors >= 4.2 && < 6, bimap >= 0.3 && < 0.6, blaze-builder >= 0.4.1 && < 0.5, @@ -175,7 +175,7 @@ library if flag(use-template-haskell) build-depends: dependent-sum-template >= 0.1 && < 0.3, - template-haskell >= 2.12.0 && < 2.23 + template-haskell >= 2.12.0 && < 2.24 other-extensions: TemplateHaskell cpp-options: -DUSE_TEMPLATE_HASKELL other-modules: diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr.hs b/reflex-dom-core/src/Reflex/Dom/Xhr.hs index 31095e5a..8dd81e14 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr.hs @@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} @@ -174,7 +173,6 @@ import Data.Text.Encoding import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy.Builder as B import Data.Traversable -import Data.Typeable import Language.Javascript.JSaddle.Monad (JSM, askJSM, runJSM, MonadJSM, liftJSM) @@ -183,7 +181,7 @@ data XhrRequest a , _xhrRequest_url :: Text , _xhrRequest_config :: XhrRequestConfig a } - deriving (Show, Read, Eq, Ord, Typeable, Functor) + deriving (Show, Read, Eq, Ord, Functor) data XhrRequestConfig a = XhrRequestConfig { _xhrRequestConfig_headers :: Map Text Text @@ -194,7 +192,7 @@ data XhrRequestConfig a , _xhrRequestConfig_withCredentials :: Bool , _xhrRequestConfig_responseHeaders :: XhrResponseHeaders } - deriving (Show, Read, Eq, Ord, Typeable, Functor) + deriving (Show, Read, Eq, Ord, Functor) data XhrResponse = XhrResponse { _xhrResponse_status :: Word @@ -203,12 +201,11 @@ data XhrResponse , _xhrResponse_responseText :: Maybe Text , _xhrResponse_headers :: Map (CI Text) Text } - deriving (Typeable) data XhrResponseHeaders = OnlyHeaders (Set.Set (CI Text)) -- ^ Parse a subset of headers from the XHR Response | AllHeaders -- ^ Parse all headers from the XHR Response - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) instance Default XhrResponseHeaders where def = OnlyHeaders mempty diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs b/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs index f394a644..aa661af8 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs @@ -1,12 +1,9 @@ -{-# LANGUAGE DeriveDataTypeable #-} - module Reflex.Dom.Xhr.Exception where import Control.Exception (Exception (..)) -import Data.Typeable data XhrException = XhrException_Error | XhrException_Aborted - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) instance Exception XhrException diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs b/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs index 360d2081..7c3d90e6 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs @@ -1,10 +1,7 @@ -{-# LANGUAGE DeriveDataTypeable #-} - module Reflex.Dom.Xhr.ResponseType where import Data.ByteString (ByteString) import Data.Text (Text) -import Data.Typeable import GHCJS.DOM.Blob (Blob) data XhrResponseType @@ -12,7 +9,7 @@ data XhrResponseType | XhrResponseType_ArrayBuffer | XhrResponseType_Blob | XhrResponseType_Text - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) data XhrResponseBody = XhrResponseBody_Default Text diff --git a/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal b/reflex-dom-test-selenium/reflex-dom-test-selenium.cabal index ec9598b7..5e1025e2 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.21, + base >= 4.7 && < 4.22, bytestring >= 0.10 && < 0.13, chrome-test-utils, exceptions, diff --git a/reflex-dom/reflex-dom.cabal b/reflex-dom/reflex-dom.cabal index 6a91fa48..0ced4c55 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.21, + base >= 4.7 && < 4.22, bytestring >= 0.10 && < 0.13, reflex >= 0.8 && < 1, reflex-dom-core >= 0.8.1.0 && <0.9,