allow ghc96

fanshi1028 · Jul 5, 2023 · 2e77c63 · 2e77c63
1 parent 05c5d6c
commit 2e77c63
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/monomer.cabal b/monomer.cabal
@@ -183,7 +183,7 @@ library
     , formatting >=6.0 && <8.0
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6
@@ -230,7 +230,7 @@ executable books
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6
@@ -273,7 +273,7 @@ executable dev-test-app
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6
@@ -315,7 +315,7 @@ executable generative
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , random >=1.1 && <1.3
@@ -360,7 +360,7 @@ executable opengl
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , random >=1.1 && <1.3
@@ -407,7 +407,7 @@ executable ticker
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6
@@ -453,7 +453,7 @@ executable todo
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6
@@ -504,7 +504,7 @@ executable tutorial
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , random >=1.1 && <1.3
@@ -603,7 +603,7 @@ test-suite monomer-test
     , http-client >=0.6 && <0.9
     , lens >=4.16 && <6
     , monomer
-    , mtl >=2.1 && <2.3
+    , mtl >=2.1 && <2.4
     , nanovg >=0.8.1 && <1.0
     , process ==1.6.*
     , sdl2 >=2.5.0 && <2.6

diff --git a/package.yaml b/package.yaml
@@ -40,7 +40,7 @@ dependencies:
   - http-client >= 0.6 && < 0.9
   - JuicyPixels >= 3.2.9 && < 3.5
   - lens >= 4.16 && < 6
-  - mtl >= 2.1 && < 2.3
+  - mtl >= 2.1 && < 2.4
   - nanovg >= 0.8.1 && < 1.0
   - OpenGLRaw >= 3.3 && < 3.4
   - process >= 1.6 && < 1.7

diff --git a/src/Monomer/Main/Platform.hs b/src/Monomer/Main/Platform.hs
@@ -23,7 +23,7 @@ module Monomer.Main.Platform (
 ) where
 
 import Control.Exception (finally)
-import Control.Monad.Extra (whenJust)
+import Control.Monad.Extra (whenJust, when, forM_, void)
 import Control.Monad.State
 import Data.Maybe
 import Data.Text (Text)

diff --git a/test/unit/Monomer/TestUtil.hs b/test/unit/Monomer/TestUtil.hs
@@ -37,6 +37,7 @@ import Monomer.Main.Types
 import Monomer.Main.Util
 
 import qualified Monomer.Lens as L
+import Control.Monad (foldM)
 
 data InitWidget
   = WInit