ui: fix build issues with older brick/snapshots, require brick 0.23+

hledger-ui/Hledger/UI/AccountsScreen.hs

@@ -12,7 +12,7 @@ module Hledger.UI.AccountsScreen
 where
 
 import Brick
-import Brick.Widgets.List hiding (reverse)
+import Brick.Widgets.List
 import Brick.Widgets.Edit
 import Control.Monad
 import Control.Monad.IO.Class (liftIO)

hledger-ui/Hledger/UI/RegisterScreen.hs

@@ -24,7 +24,7 @@ import Data.Time.Calendar
 import qualified Data.Vector as V
 import Graphics.Vty (Event(..),Key(..),Modifier(..))
 import Brick
-import Brick.Widgets.List hiding (reverse)
+import Brick.Widgets.List
 import Brick.Widgets.Edit
 import Lens.Micro.Platform
 import Safe

hledger-ui/Hledger/UI/UITypes.hs

@@ -40,7 +40,7 @@ module Hledger.UI.UITypes where
 
 import Data.Time.Calendar (Day)
 import Brick
-import Brick.Widgets.List hiding (reverse)
+import Brick.Widgets.List
 import Brick.Widgets.Edit (Editor)
 import Lens.Micro.Platform
 import Text.Show.Functions ()

hledger-ui/Hledger/UI/UIUtils.hs

@@ -31,7 +31,7 @@ import Brick.Widgets.Border
 import Brick.Widgets.Border.Style
 import Brick.Widgets.Dialog
 import Brick.Widgets.Edit
-import Brick.Widgets.List hiding (reverse)
+import Brick.Widgets.List
 import Control.Monad.IO.Class
 import Data.List
 import Data.Maybe
@@ -73,8 +73,6 @@ suspend st = suspendAndResume $ suspendSignal >> return st
 redraw :: s -> EventM a (Next s)
 redraw st = getVtyHandle >>= liftIO . refresh >> continue st
 
--- ui
-
 -- | Wrap a widget in the default hledger-ui screen layout.
 defaultLayout :: Widget Name -> Widget Name -> Widget Name -> Widget Name
 defaultLayout toplabel bottomlabel =

hledger-ui/hledger-ui.cabal

@@ -1,10 +1,10 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: d833450b55016a44ba8764317be0644717747ee8c20a2b191f3700a3cb67e81c
+-- hash: 56f365215d44b833b7704eb8632757f5ab6d56464afa56cf9fb83d88ae7bb32f
 
 name:           hledger-ui
 version:        1.13
@@ -94,7 +94,7 @@ executable hledger-ui
     buildable: False
   else
     build-depends:
-        brick >=0.12
+        brick >=0.23
       , unix
       , vty >=5.5
   if flag(threaded)

hledger-ui/package.yaml

@@ -81,7 +81,7 @@ when:
      buildable: false
    else:
      dependencies:
-       - brick >=0.12
+       - brick >=0.23
        - unix
        - vty >=5.5
 

stack-ghc8.0.yaml

@@ -53,3 +53,5 @@ extra-deps:
 # newer fsnotify has a different api and may be more robust
 - fsnotify-0.3.0.1
 - Glob-0.9.2
+- brick-0.23
+- word-wrap-0.4.1