Fixes to compile the tests with 8.4.3 on cabal new-*.

Author: davean

reflex.cabal

@@ -178,9 +178,17 @@ test-suite CrossImpl
     base,
     containers,
     dependent-map,
+    dependent-sum,
+    deepseq >= 1.3 && < 1.5,
     mtl,
+    transformers,
     ref-tf,
     reflex
+  other-modules:
+    Reflex.Test
+    Reflex.TestPlan
+    Reflex.Plan.Reflex
+    Reflex.Plan.Pure
 
 test-suite hlint
   type: exitcode-stdio-1.0
@@ -199,12 +207,21 @@ test-suite EventWriterT
   main-is: EventWriterT.hs
   hs-source-dirs: test
   build-depends: base
+               , containers
+               , deepseq >= 1.3 && < 1.5
                , dependent-sum
                , lens
+               , mtl
                , these
                , transformers
                , reflex
                , ref-tf
+  other-modules:
+    Reflex.Test
+    Reflex.TestPlan
+    Reflex.Plan.Reflex
+    Reflex.Plan.Pure
+    Test.Run
 
 test-suite RequesterT
   type: exitcode-stdio-1.0
@@ -219,6 +236,9 @@ test-suite RequesterT
                , reflex
                , ref-tf
   buildable: False
+  other-modules:
+    Reflex.TestPlan
+    Reflex.Plan.Pure
 
 test-suite QueryT
   type: exitcode-stdio-1.0
@@ -228,35 +248,59 @@ test-suite QueryT
                , containers
                , dependent-map
                , dependent-sum
+               , deepseq >= 1.3 && < 1.5
                , lens
                , monoidal-containers
+               , mtl
                , ref-tf
                , reflex
                , semigroups
                , these
                , transformers
-  other-modules: Test.Run
+  other-modules:
+    Test.Run
+    Reflex.TestPlan
+    Reflex.Plan.Reflex
+    Reflex.Plan.Pure
 
 test-suite GC-Semantics
   type: exitcode-stdio-1.0
   main-is: GC.hs
   hs-source-dirs: test
   build-depends: base
+               , containers
                , dependent-sum
                , dependent-map
+               , deepseq >= 1.3 && < 1.5
+               , mtl
                , these
                , transformers
                , reflex
                , ref-tf
   if impl(ghc < 8)
     build-depends: semigroups
+  other-modules:
+    Reflex.Plan.Pure
+    Reflex.Plan.Reflex
+    Reflex.TestPlan
+    Test.Run
 
 test-suite rootCleanup
   type: exitcode-stdio-1.0
   main-is: rootCleanup.hs
   hs-source-dirs: test
   build-depends: base
+               , containers
+               , deepseq >= 1.3 && < 1.5
+               , dependent-sum
+               , mtl
                , reflex
+               , ref-tf
+               , these
+  other-modules:
+    Reflex.Plan.Pure
+    Reflex.TestPlan
+    Test.Run
 
 benchmark spider-bench
   type: exitcode-stdio-1.0

test/QueryT.hs

@@ -28,14 +28,14 @@ instance Query MyQuery where
   type QueryResult MyQuery = ()
   crop _ _ = ()
 
-instance (Ord k, Query a, Eq (QueryResult a)) => Query (Selector k a) where
+instance (Ord k, Query a, Eq (QueryResult a), Align (MonoidalMap k)) => Query (Selector k a) where
   type QueryResult (Selector k a) = Selector k (QueryResult a)
   crop q r = undefined
 
 newtype Selector k a = Selector { unSelector :: MonoidalMap k a }
   deriving (Show, Read, Eq, Ord, Functor)
 
-instance (Ord k, Eq a, Monoid a) => Semigroup (Selector k a) where
+instance (Ord k, Eq a, Monoid a, Align (MonoidalMap k)) => Semigroup (Selector k a) where
   (Selector a) <> (Selector b) = Selector $ fmapMaybe id $ f a b
     where
       f = alignWith $ \case
@@ -45,14 +45,14 @@ instance (Ord k, Eq a, Monoid a) => Semigroup (Selector k a) where
           let z = x `mappend` y
           in if z == mempty then Nothing else Just z
 
-instance (Ord k, Eq a, Monoid a) => Monoid (Selector k a) where
+instance (Ord k, Eq a, Monoid a, Align (MonoidalMap k)) => Monoid (Selector k a) where
   mempty = Selector AMap.empty
   mappend = (<>)
 
-instance (Eq a, Ord k, Group a) => Group (Selector k a) where
+instance (Eq a, Ord k, Group a, Align (MonoidalMap k)) => Group (Selector k a) where
   negateG = fmap negateG
 
-instance (Eq a, Ord k, Group a) => Additive (Selector k a)
+instance (Eq a, Ord k, Group a, Align (MonoidalMap k)) => Additive (Selector k a)
 
 main :: IO ()
 main = do

test/Reflex/Bench/Focused.hs

@@ -184,7 +184,7 @@ switchMergeBehaviors mapChanges = pull . joinMap <$> holdMap mapChanges
 
 -- | Turn an UpdatedMap into a Dynamic by applying the differences to the initial value
 holdMapDyn :: (Reflex t, MonadHold t m, MonadFix m, Ord k) => UpdatedMap t k a -> m (Dynamic t (Map k a))
-holdMapDyn (UpdatedMap initial changes) = foldDyn (flip (Map.foldWithKey modify)) initial changes
+holdMapDyn (UpdatedMap initial changes) = foldDyn (flip (Map.foldrWithKey modify)) initial changes
 
   where
     modify k Nothing items = Map.delete k items