From bcd6b3897826d7b54288ea723636baff11c77a6e Mon Sep 17 00:00:00 2001 From: Sam Tay Date: Mon, 6 May 2024 12:33:41 -0400 Subject: [PATCH] Bump to lts-22.19 and brick-2.1.1 --- src/UI/Game.hs | 8 +++++--- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- tetris.cabal | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/UI/Game.hs b/src/UI/Game.hs index c4c5214..353eaf3 100644 --- a/src/UI/Game.hs +++ b/src/UI/Game.hs @@ -19,6 +19,8 @@ import qualified Brick.Widgets.Border.Style as BS import qualified Brick.Widgets.Center as C import Control.Lens hiding (preview, op, zoom) import qualified Graphics.Vty as V +import qualified Graphics.Vty.CrossPlatform +import qualified Graphics.Vty.Config import Data.Map (Map) import qualified Data.Map as M import Linear.V2 (V2(..)) @@ -66,9 +68,9 @@ playGame lvl mp = do writeBChan chan Tick threadDelay delay initialGame <- initGame lvl - let builder = V.mkVty V.defaultConfig - initialVty <- builder - ui <- customMain initialVty builder (Just chan) app $ UI + let buildVty = Graphics.Vty.CrossPlatform.mkVty Graphics.Vty.Config.defaultConfig + initialVty <- buildVty + ui <- customMain initialVty buildVty (Just chan) app $ UI { _game = initialGame , _preview = mp , _locked = False diff --git a/stack.yaml b/stack.yaml index 906c2fd..be59776 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ extra-package-dbs: [] packages: - '.' extra-deps: [] -resolver: lts-20.1 +resolver: lts-22.19 nix: packages: - gcc diff --git a/stack.yaml.lock b/stack.yaml.lock index e067f78..f8f2098 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: b73b2b116143aea728c70e65c3239188998bac5bc3be56465813dacd74215dc5 - size: 648424 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/1.yaml - original: lts-20.1 + sha256: e5cac927cf7ccbd52aa41476baa68b88c564ee6ddc3bc573dbf4210069287fe7 + size: 713340 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/19.yaml + original: lts-22.19 diff --git a/tetris.cabal b/tetris.cabal index 8520835..46ab498 100644 --- a/tetris.cabal +++ b/tetris.cabal @@ -21,9 +21,11 @@ library , containers , lens , linear + , mtl , random , transformers , vty + , vty-crossplatform default-language: Haskell2010 executable tetris