157e8eb · reflex · git.iko.soy

git.iko.soy/reflex

Merge remote-tracking branch 'origin/develop' into ghc810

commit157e8eb314d5bb2adab14852f58e617c7db409d0 authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateSat 21 Nov 2020, 23:11 (6 years ago) parent78ee62a 9b721a5

8 files changed+16−8

compare with develop

unifiedsplit

ChangeLog.md+7−1 reflex.cabal+5−2 src/Reflex/PerformEvent/Class.hs−1 src/Reflex/PostBuild/Base.hs−1 src/Reflex/PostBuild/Class.hs−1 src/Reflex/Spider/Internal.hs+1−1 test/GC.hs+1 test/hlint.hs+2−1

ChangeLog.md+7−1

@@ -1,7 +1,13 @@

11# Revision history for reflex

3−## Unreleased

3+## 0.8.0.0

5+* Replace 0.7.2.0 with 0.8.0.0 to reflect the `MonadHold` interface change. Deprecates 0.7.2.0.

7+## 0.7.2.0

48* ([#416](https://github.com/reflex-frp/reflex/pull/416)) Add `now :: m (Event t ())` to `MonadHold`.

9+* Extend some dependency version bounds

10+* Fix HLint 3 test

511

612## 0.7.1.0

713

reflex.cabal+5−2

@@ -1,5 +1,5 @@

11Name: reflex

2−Version: 0.7.1.0

2+Version: 0.8.0.0

33Synopsis: Higher-order Functional Reactive Programming

44Description:

55 Interactive programs without callbacks or side-effects.

@@ -257,7 +257,10 @@ test-suite hlint

257257 , directory

258258 , filepath

259259 , filemanip

260− , hlint (< 2.1 || >= 2.2.2) && < 3

260+ if impl(ghc >= 8.8)

261+ build-depends: hlint >= 3

262+ else

263+ build-depends: hlint (< 2.1 || >= 2.2.2) && < 3

261264 if impl(ghcjs)

262265 buildable: False

263266

src/Reflex/PerformEvent/Class.hs−1

@@ -8,7 +8,6 @@

88{-# LANGUAGE RankNTypes #-}

99{-# LANGUAGE ScopedTypeVariables #-}

1010{-# LANGUAGE TypeFamilies #-}

11−{-# LANGUAGE TypeOperators #-}

1211{-# LANGUAGE UndecidableInstances #-}

1312#ifdef USE_REFLEX_OPTIMIZER

1413{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/PostBuild/Base.hs−1

@@ -9,7 +9,6 @@

99{-# LANGUAGE RecursiveDo #-}

1010{-# LANGUAGE ScopedTypeVariables #-}

1111{-# LANGUAGE TypeFamilies #-}

12−{-# LANGUAGE TypeOperators #-}

1312{-# LANGUAGE UndecidableInstances #-}

1413#ifdef USE_REFLEX_OPTIMIZER

1514{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/PostBuild/Class.hs−1

@@ -6,7 +6,6 @@

66{-# LANGUAGE FunctionalDependencies #-}

77{-# LANGUAGE ScopedTypeVariables #-}

88{-# LANGUAGE TypeFamilies #-}

9−{-# LANGUAGE TypeOperators #-}

109{-# LANGUAGE UndecidableInstances #-}

1110#ifdef USE_REFLEX_OPTIMIZER

1211{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/Spider/Internal.hs+1−1

@@ -9,7 +9,6 @@

99{-# LANGUAGE GADTs #-}

1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}

1111{-# LANGUAGE LambdaCase #-}

12−{-# LANGUAGE MultiWayIf #-}

1312{-# LANGUAGE RankNTypes #-}

1413{-# LANGUAGE RoleAnnotations #-}

1514{-# LANGUAGE ScopedTypeVariables #-}

@@ -20,6 +19,7 @@

2019{-# LANGUAGE DeriveFunctor #-}

2120{-# LANGUAGE StandaloneDeriving #-}

2221{-# LANGUAGE InstanceSigs #-}

22+{-# LANGUAGE MultiWayIf #-}

2323

2424#ifdef USE_REFLEX_OPTIMIZER

2525{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

test/GC.hs+1

@@ -18,6 +18,7 @@ import Data.GADT.Compare

1818import Data.IORef

1919import Data.Semigroup

2020import Data.These

21+import Data.Type.Equality ((:~:)(Refl))

2122

2223import Data.Functor.Misc

2324import Data.Patch

test/hlint.hs+2−1

@@ -1,7 +1,7 @@

11module Main where

33import Control.Monad

4−import Language.Haskell.HLint3 (hlint)

4+import Language.Haskell.HLint (hlint)

55import System.Directory

66import System.Exit (exitFailure, exitSuccess)

77import System.FilePath

@@ -22,6 +22,7 @@ main = do

2222 , "--ignore=Use unless"

2323 , "--ignore=Reduce duplication"

2424 , "--cpp-define=USE_TEMPLATE_HASKELL"

25+ , "--cpp-define=DEBUG"

2526 , "--ignore=Use tuple-section"

2627 ]

2728 recurseInto = and <$> sequence