[#561] Use microaeson from hackage instead of the fork (#562)

* [#561] Use microaeson from hackage instead of the fork Resolves #561 * Update brick, fix stack
kowainik · Feb 19, 2022 · 1e1da21 · 1e1da21
1 parent 0c03dd0
commit 1e1da21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -3,8 +3,3 @@ packages:
     summoner-tui/
 
 tests: true
-
-source-repository-package
-    type: git
-    location: https://github.com/kowainik/microaeson.git
-    tag: 0630d4d8c6d912180b35795dc462f8ea75affa99
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2022-01-10
+resolver: nightly-2022-02-18
 
 packages:
   - summoner-cli/
@@ -9,3 +9,5 @@ extra-deps:
   - megaparsec-9.0.1
   - microaeson-0.1.0.0
   - tomland-1.3.3.0
+  - validation-selective-0.1.0.1
+  - selective-0.4.2
diff --git a/summoner-cli/summoner.cabal b/summoner-cli/summoner.cabal
@@ -151,7 +151,7 @@ library
                      , generic-data >= 0.8.0.0 && < 0.10
                      , gitrev ^>= 1.3.1
                      , microaeson ^>= 0.1.0.0
-                     , optparse-applicative ^>= 0.16
+                     , optparse-applicative >= 0.16 && < 0.18
                      , process ^>= 1.6.1.0
                      , shellmet ^>= 0.0.3.0
                      , time >= 1.8 && < 1.14
@@ -188,7 +188,7 @@ test-suite summoner-test
 
   build-depends:       directory
                      , filepath
-                     , hedgehog >= 0.5.3 && < 1.1
+                     , hedgehog >= 0.5.3 && < 1.2
                      , hspec >= 2.4.8
                      , hspec-hedgehog ^>= 0.0.1.1
                      , tomland

diff --git a/summoner-tui/src/Summoner/Tui/Field.hs b/summoner-tui/src/Summoner/Tui/Field.hs
@@ -121,7 +121,7 @@ activeCheckboxField stLens isActive name label initialState = FormFieldState
         }
 
 -- | Renders checkbox depending on its state.
-renderCheckbox :: Bool -> String -> n -> Bool -> Bool -> Widget n
+renderCheckbox :: (Ord n) => Bool -> String -> n -> Bool -> Bool -> Widget n
 renderCheckbox isEnabled label n foc val =
     let addAttr = if foc then withDefAttr focusedFormInputAttr else id
         csr = if foc then showCursor n (Location (1,0)) else id

diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal
@@ -80,7 +80,7 @@ library
   autogen-modules:     Paths_summoner_tui
   other-modules:       Paths_summoner_tui
 
-  build-depends:       brick >= 0.56 && < 0.66
+  build-depends:       brick >= 0.56 && < 0.68
                      , colourista ^>= 0.1
                      , directory ^>= 1.3.0.2
                      , microlens ^>= 0.4