diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ Brick changelog --------------- +2.10 +---- + +* Updated `brick` to build with `microlens == 0.5.0.0` which moved its + Field* classes to `Lens.Micro.FieldN`. + 2.9 --- diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015-2018, Jonathan Daugherty. +Copyright (c) 2015-2025, Jonathan Daugherty. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/brick.cabal b/brick.cabal --- a/brick.cabal +++ b/brick.cabal @@ -1,5 +1,5 @@ name: brick -version: 2.9 +version: 2.10 synopsis: A declarative terminal user interface library description: Write terminal user interfaces (TUIs) painlessly with 'brick'! You @@ -32,7 +32,7 @@ license-file: LICENSE author: Jonathan Daugherty maintainer: Jonathan Daugherty -copyright: (c) Jonathan Daugherty 2015-2024 +copyright: (c) Jonathan Daugherty 2015-2025 category: Graphics build-type: Simple cabal-version: 1.18 @@ -46,10 +46,10 @@ || == 9.0.2 || == 9.2.8 || == 9.4.8 - || == 9.6.6 + || == 9.6.7 || == 9.8.4 - || == 9.10.1 - || == 9.12.1 + || == 9.10.3 + || == 9.12.2 extra-doc-files: README.md, docs/guide.rst, @@ -59,7 +59,7 @@ Source-Repository head type: git - location: git://github.com/jtdaugherty/brick.git + location: http://github.com/jtdaugherty/brick Flag demos Description: Build demonstration programs @@ -161,9 +161,7 @@ default-extensions: CPP main-is: TableDemo.hs build-depends: base, - brick, - text, - vty + brick executable brick-tail-demo if !flag(demos) @@ -177,7 +175,6 @@ brick, text, vty, - vty-crossplatform, random, microlens-th, microlens-mtl @@ -191,8 +188,7 @@ default-extensions: CPP main-is: ReadmeDemo.hs build-depends: base, - brick, - text + brick executable brick-file-browser-demo if !flag(demos) @@ -234,7 +230,6 @@ main-is: TextWrapDemo.hs build-depends: base, brick, - text, word-wrap executable brick-cache-demo @@ -248,9 +243,6 @@ build-depends: base, brick, vty, - text, - microlens >= 0.3.0.0, - microlens-th, mtl executable brick-visibility-demo @@ -263,7 +255,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-th, microlens-mtl @@ -280,8 +271,6 @@ brick, vty, vty-crossplatform, - text, - microlens, microlens-mtl, microlens-th @@ -295,9 +284,7 @@ main-is: ViewportScrollDemo.hs build-depends: base, brick, - vty, - text, - microlens + vty executable brick-dialog-demo if !flag(demos) @@ -308,9 +295,7 @@ main-is: DialogDemo.hs build-depends: base, brick, - vty, - text, - microlens + vty executable brick-mouse-demo if !flag(demos) @@ -322,11 +307,9 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-th, microlens-mtl, - text-zipper, mtl executable brick-layer-demo @@ -339,7 +322,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-th, microlens-mtl @@ -354,7 +336,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-th @@ -367,9 +348,7 @@ main-is: CroppingDemo.hs build-depends: base, brick, - vty, - text, - microlens + vty executable brick-padding-demo if !flag(demos) @@ -380,9 +359,7 @@ main-is: PaddingDemo.hs build-depends: base, brick, - vty, - text, - microlens + vty executable brick-theme-demo if !flag(demos) @@ -394,9 +371,7 @@ build-depends: base, brick, vty, - text, - mtl, - microlens + mtl executable brick-attr-demo if !flag(demos) @@ -407,9 +382,7 @@ main-is: AttrDemo.hs build-depends: base, brick, - vty, - text, - microlens + vty executable brick-tabular-list-demo if !flag(demos) @@ -421,11 +394,9 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-mtl, microlens-th, - mtl, vector executable brick-list-demo @@ -438,7 +409,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-mtl, mtl, @@ -454,7 +424,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-mtl, mtl, @@ -472,10 +441,7 @@ vty, vty-crossplatform, containers, - text, - microlens-platform, - stm, - mtl + microlens-platform executable brick-custom-event-demo if !flag(demos) @@ -487,7 +453,6 @@ build-depends: base, brick, vty, - text, microlens >= 0.3.0.0, microlens-th, microlens-mtl @@ -500,10 +465,7 @@ default-language: Haskell2010 main-is: FillDemo.hs build-depends: base, - brick, - vty, - text, - microlens + brick executable brick-hello-world-demo if !flag(demos) @@ -513,10 +475,7 @@ default-language: Haskell2010 main-is: HelloWorldDemo.hs build-depends: base, - brick, - vty, - text, - microlens + brick executable brick-edit-demo if !flag(demos) @@ -528,9 +487,6 @@ build-depends: base, brick, vty, - text, - vector, - mtl, microlens >= 0.3.0.0, microlens-th, microlens-mtl @@ -545,9 +501,6 @@ build-depends: base, brick, vty, - text, - vector, - mtl, microlens >= 0.3.0.0, microlens-th, microlens-mtl @@ -563,8 +516,7 @@ build-depends: base, brick, vty, - text, - microlens + text executable brick-dynamic-border-demo if !flag(demos) @@ -575,10 +527,7 @@ default-language: Haskell2010 main-is: DynamicBorderDemo.hs build-depends: base <= 5, - brick, - vty, - text, - microlens + brick executable brick-progressbar-demo if !flag(demos) @@ -591,8 +540,6 @@ build-depends: base, brick, vty, - text, - microlens, microlens-mtl, microlens-th diff --git a/docs/guide.rst b/docs/guide.rst --- a/docs/guide.rst +++ b/docs/guide.rst @@ -1993,8 +1993,8 @@ border $ str "This will be cached" -In the example above, the first time the ``border $ str "This will be -cached"`` widget is rendered, the resulting Vty image will be stored +In the example above, the first time the ``border $ str "This will be cached"`` +widget is rendered, the resulting Vty image will be stored in the rendering cache under the key ``ExpensiveThing``. On subsequent renderings the cached Vty image will be used instead of re-rendering the widget. This example doesn't need caching to improve performance, but diff --git a/src/Brick/Main.hs b/src/Brick/Main.hs --- a/src/Brick/Main.hs +++ b/src/Brick/Main.hs @@ -238,6 +238,10 @@ -- | Like 'customMainWithVty', except that Vty is initialized with the -- default configuration. +-- +-- The returned 'Vty' handle still has control of the terminal. The +-- caller is responsible for calling 'shutdown' to restore the terminal +-- state. customMainWithDefaultVty :: (Ord n) => Maybe (BChan e) -- ^ An event channel for sending custom diff --git a/src/Brick/Types/Common.hs b/src/Brick/Types/Common.hs --- a/src/Brick/Types/Common.hs +++ b/src/Brick/Types/Common.hs @@ -3,6 +3,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE CPP #-} module Brick.Types.Common ( Location(..) , locL @@ -16,7 +17,11 @@ import GHC.Generics import Control.DeepSeq import Lens.Micro (_1, _2) +#if MIN_VERSION_microlens(0,5,0) +import Lens.Micro.FieldN (Field1, Field2) +#else import Lens.Micro.Internal (Field1, Field2) +#endif -- | A terminal screen location. data Location = Location { loc :: (Int, Int)