Skip to content

Commit

Permalink
Merge pull request #444 from reflex-frp/ghc810
Browse files Browse the repository at this point in the history
Fixes for ghc 8.10
  • Loading branch information
ali-abrar authored Apr 16, 2021
2 parents 97a7c80 + 4f69eca commit 0bc631f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 188 deletions.
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.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
os: ['ubuntu-latest', 'macos-latest']
exclude:
# There are some linker warnings in 802 on darwin that
Expand Down
177 changes: 0 additions & 177 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Revision history for reflex

## 0.8.1.0

* Add support for GHC 8.10
* Drop support for GHC 8.2.* and earlier

## 0.8.0.0

* Replace 0.7.2.0 with 0.8.0.0 to reflect the `MonadHold` interface change. Deprecates 0.7.2.0.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## [Reflex](https://reflex-frp.org/)

[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex.svg)](https://hackage.haskell.org/package/reflex) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex/badge)](https://matrix.hackage.haskell.org/#/package/reflex) [![Travis CI](https://api.travis-ci.org/reflex-frp/reflex.svg?branch=master)](https://travis-ci.org/reflex-frp/reflex) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex/blob/master/LICENSE)
[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex.svg)](https://hackage.haskell.org/package/reflex) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex/badge)](https://matrix.hackage.haskell.org/#/package/reflex) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex/blob/master/LICENSE)

Interactive programs without callbacks or side-effects. Functional Reactive Programming (FRP) uses composable events and time-varying values to describe interactive systems as pure functions. Just like other pure functional code, functional reactive code is easier to get right on the first try, maintain, and reuse.

Expand Down
2 changes: 0 additions & 2 deletions cabal.project.freeze

This file was deleted.

10 changes: 5 additions & 5 deletions reflex.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: reflex
Version: 0.8.0.0
Version: 0.8.1.0
Synopsis: Higher-order Functional Reactive Programming
Description:
Interactive programs without callbacks or side-effects.
Expand Down Expand Up @@ -28,7 +28,7 @@ extra-source-files:
ChangeLog.md

tested-with:
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1,
GHC ==8.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.2,
GHCJS ==8.4

flag use-reflex-optimizer
Expand Down Expand Up @@ -71,7 +71,7 @@ library
hs-source-dirs: src
build-depends:
MemoTrie == 0.6.*,
base >= 4.9 && < 4.14,
base >= 4.9 && < 4.15,
bifunctors >= 5.2 && < 5.6,
comonad >= 5.0.4 && < 5.1,
constraints-extras >= 0.3 && < 0.4,
Expand All @@ -86,7 +86,7 @@ library
patch >= 0.0.1 && < 0.1,
prim-uniq >= 0.1.0.1 && < 0.3,
primitive >= 0.5 && < 0.8,
profunctors >= 5.3 && < 5.6,
profunctors >= 5.3 && < 5.7,
random == 1.1.*,
ref-tf == 0.4.*,
reflection == 2.1.*,
Expand Down Expand Up @@ -185,7 +185,7 @@ library
dependent-sum >= 0.6 && < 0.8,
haskell-src-exts >= 1.16 && < 1.24,
haskell-src-meta >= 0.6 && < 0.9,
template-haskell >= 2.9 && < 2.16
template-haskell >= 2.9 && < 2.17
exposed-modules:
Reflex.Dynamic.TH
other-extensions: TemplateHaskell
Expand Down
2 changes: 1 addition & 1 deletion src/Reflex/Profiled.hs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ instance Reflex t => Reflex (ProfiledTimeline t) where
pushCheap f (Event_Profiled e) = coerce $ pushCheap (coerce f) $ profileEvent e
pull = Behavior_Profiled . pull . coerce
fanG (Event_Profiled e) = EventSelectorG $ coerce $ selectG (fanG $ profileEvent e)
mergeG :: forall (k :: z -> *) q v. GCompare k
mergeG :: forall z (k :: z -> *) q v. GCompare k
=> (forall a. q a -> Event (ProfiledTimeline t) (v a))
-> DMap k q -> Event (ProfiledTimeline t) (DMap k v)
mergeG nt = Event_Profiled #. mergeG (coerce nt)
Expand Down
2 changes: 1 addition & 1 deletion src/Reflex/Spider/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2775,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
{-# INLINABLE mergeG #-}
mergeG
:: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
:: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
=> (forall a. q a -> R.Event (SpiderTimeline x) (v a))
-> DMap k q
-> R.Event (SpiderTimeline x) (DMap k v)
Expand Down

0 comments on commit 0bc631f

Please sign in to comment.