Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GHC 9.12 #485

Merged
merged 3 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .ghci

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions reflex-dom-core/reflex-dom-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 3 additions & 6 deletions reflex-dom-core/src/Reflex/Dom/Xhr.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE GADTs #-}
Expand Down Expand Up @@ -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)

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 1 addition & 4 deletions reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
{-# 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
= XhrResponseType_Default
| XhrResponseType_ArrayBuffer
| XhrResponseType_Blob
| XhrResponseType_Text
deriving (Show, Read, Eq, Ord, Typeable)
deriving (Show, Read, Eq, Ord)

data XhrResponseBody
= XhrResponseBody_Default Text
Expand Down
2 changes: 1 addition & 1 deletion reflex-dom-test-selenium/reflex-dom-test-selenium.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion reflex-dom/reflex-dom.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading