Skip to content

Commit

Permalink
Merge branch 'develop' into fix-matchResponseMapWithRequests-with-pro…
Browse files Browse the repository at this point in the history
…mpt-response
  • Loading branch information
ali-abrar authored Oct 22, 2024
2 parents 056922b + e21f856 commit e2b72e8
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 16 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ jobs:
build:
strategy:
matrix:
ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.5', '9.6.1']
ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.5', '9.6.1', '9.8.2', '9.10.1']
os: ['ubuntu-latest', 'macos-latest']
runs-on: ${{ matrix.os }}

name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
steps:

- uses: actions/checkout@v3

- uses: haskell/actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: '3.10.1.0'
cabal-version: '3.10.3.0'

- name: Cache
uses: actions/cache@v3
env:
Expand All @@ -31,11 +34,16 @@ jobs:
${{ runner.os }}
- name: Install dependencies
run: cabal build --only-dependencies --enable-tests --enable-benchmarks
run: |
cabal update
cabal build --only-dependencies --enable-tests --enable-benchmarks
- name: Build
run: cabal build --enable-tests --enable-benchmarks all

- name: Run tests
run: cabal test --enable-tests all

- if: matrix.ghc != '8.4.4'
# docs aren't built on ghc 8.4.4 because some dependency docs don't build on older GHCs
name: Build Docs
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for reflex

## 0.9.3.1

* Add support for GHC 9.8 and 9.10

## 0.9.3.0

* Headless Host: Generalize to allow returning arbitrary types
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Reflex is a fully-deterministic, higher-order Functional Reactive Programming in
* [Reflex-DOM](https://github.com/reflex-frp/reflex-dom): A framework built on Reflex that facilitates the development of web pages, including highly-interactive single-page apps.
* [Obelisk](https://github.com/obsidiansystems/obelisk#obelisk): A framework built on Reflex and Reflex-DOM for functional reactive web and mobile applications, with batteries included.
* [Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
* [#reflex-frp:matrix.org](https://matrix.to/#/#reflex-frp:matrix.org): Official Matrix room
* [/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
* [irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)

Expand Down
20 changes: 10 additions & 10 deletions reflex.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: reflex
Version: 0.9.3.0
Version: 0.9.3.1
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.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1,
GHC ==8.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1 || ==9.8.2 || ==9.10.1,
GHCJS ==8.6 || ==8.10

flag use-reflex-optimizer
Expand Down Expand Up @@ -71,25 +71,25 @@ library
hs-source-dirs: src
build-depends:
MemoTrie == 0.6.*,
base >= 4.11 && < 4.19,
base >= 4.11 && < 4.21,
bifunctors >= 5.2 && < 5.7,
comonad >= 5.0.4 && < 5.1,
commutative-semigroups >= 0.1 && <0.2,
constraints >= 0.10 && <0.14,
commutative-semigroups >= 0.1 && <0.3,
constraints >= 0.10 && <0.15,
constraints-extras >= 0.3 && < 0.5,
containers >= 0.6 && < 0.7,
containers >= 0.6 && < 0.8,
data-default >= 0.5 && < 0.8,
dependent-sum >= 0.6 && < 0.8,
dependent-map >= 0.3 && < 0.5,
dependent-sum >= 0.6 && < 0.8,
exceptions >= 0.10 && < 0.11,
exception-transformers >= 0.4 && < 0.5,
lens >= 4.7 && < 5.3,
lens >= 4.7 && < 5.4,
mmorph >= 1.0 && < 1.3,
monad-control >= 1.0.1 && < 1.1,
mtl >= 2.1 && < 2.4,
patch >= 0.0.7 && < 0.1,
prim-uniq >= 0.1.0.1 && < 0.3,
primitive >= 0.5 && < 0.8,
primitive >= 0.5 && < 0.10,
profunctors >= 5.3 && < 5.7,
random >= 1.1 && < 1.3,
ref-tf >= 0.4 && < 0.6,
Expand Down Expand Up @@ -189,7 +189,7 @@ library
build-depends:
haskell-src-exts >= 1.16 && < 1.24,
haskell-src-meta >= 0.6 && < 0.9,
template-haskell >= 2.9 && < 2.21
template-haskell >= 2.9 && < 2.23
exposed-modules:
Reflex.Dynamic.TH
other-extensions: TemplateHaskell
Expand Down
4 changes: 2 additions & 2 deletions release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ let

patch = self.callHackageDirect {
pkg = "patch";
ver = "0.0.8.2";
sha256 = "160zqqhjg48fr3a33gffd82qm3728c8hwf8sn37pbpv82fw71rzg";
ver = "0.0.8.3";
sha256 = "054slcrlsdcs6azwph6v3vgsgk939ax7ax9xw76whywkrim20n1w";
} {};
};
};
Expand Down
2 changes: 1 addition & 1 deletion src/Reflex/PerformEvent/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ instance (PrimMonad (HostFrame t), ReflexHost t) => PrimMonad (PerformEventT t m
type PrimState (PerformEventT t m) = PrimState (HostFrame t)
primitive = PerformEventT . lift . primitive

instance (ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) where
instance (Monad (HostFrame t), ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) where
type Performable (PerformEventT t m) = HostFrame t
{-# INLINABLE performEvent_ #-}
performEvent_ = PerformEventT . requesting_
Expand Down

0 comments on commit e2b72e8

Please sign in to comment.