Allow building with text-2.1.*

ku-fpg · Aug 27, 2023 · 7be31bf · 7be31bf
1 parent 70d32a4
commit 7be31bf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -206,7 +206,7 @@ jobs:
           source-repository-package
             type:     git
             location: https://github.com/ku-fpg/javascript-bridge
-            tag:      9fbb7e0c39978028ca9cb322a34160e11372d4ca
+            tag:      fc7da7e31a96562bfd1b0c4b9e496d11c8126d43
 
           package blank-canvas-examples
             flags: +examples

diff --git a/blank-canvas.cabal b/blank-canvas.cabal
@@ -94,7 +94,7 @@ Library
                        scotty                 >= 0.10    && < 0.13,
                        semigroups             >= 0.18    && < 1,
                        stm                    >= 2.2     && < 2.6,
-                       text                   >= 1.1     && < 2.1,
+                       text                   >= 1.1     && < 2.2,
                        text-show              >= 2       && < 4,
                        transformers           >= 0.3     && < 0.7,
                        wai                    == 3.*,

diff --git a/cabal.project b/cabal.project
@@ -8,4 +8,4 @@ package blank-canvas-examples
 source-repository-package
   type: git
   location: https://github.com/ku-fpg/javascript-bridge
-  tag: 9fbb7e0c39978028ca9cb322a34160e11372d4ca
+  tag: fc7da7e31a96562bfd1b0c4b9e496d11c8126d43
diff --git a/examples/blank-canvas-examples.cabal b/examples/blank-canvas-examples.cabal
@@ -64,7 +64,7 @@ executable blank-canvas-example-html5canvastutorial
   build-depends:       base        >= 4.11 && < 4.20,
                        base-compat >= 0.11 && < 0.14,
                        blank-canvas,
-                       text        >= 1.1  && < 2.1
+                       text        >= 1.1  && < 2.2
   hs-source-dirs:      html5canvastutorial
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -78,7 +78,7 @@ executable blank-canvas-example-keyread
   build-depends:       base        >= 4.11 && < 4.20,
                        base-compat >= 0.11 && < 0.14,
                        blank-canvas,
-                       text        >= 1.1  && < 2.1
+                       text        >= 1.1  && < 2.2
   hs-source-dirs:      keyread
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -130,7 +130,7 @@ executable blank-canvas-example-text
   build-depends:       base        >= 4.11 && < 4.20,
                        base-compat >= 0.11 && < 0.14,
                        blank-canvas,
-                       text        >= 1.1  && < 2.1
+                       text        >= 1.1  && < 2.2
   hs-source-dirs:      text
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -144,7 +144,7 @@ executable blank-canvas-example-tictactoe
   build-depends:       base         >= 4.11&& < 4.20,
                        blank-canvas,
                        containers   >= 0.5 && < 0.7,
-                       text         >= 1.1 && < 2.1
+                       text         >= 1.1 && < 2.2
   hs-source-dirs:      tictactoe
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -159,7 +159,7 @@ executable blank-canvas-example-bounce
   build-depends:       base         >= 4.11&& < 4.20,
                        blank-canvas,
                        streams      >= 0.1,
-                       text         >= 1.1 && < 2.1
+                       text         >= 1.1 && < 2.2
   hs-source-dirs:      bounce
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -173,7 +173,7 @@ executable blank-canvas-example-bounce
 --  other-modules:       Paths_blank_canvas_examples
 --  build-depends:       base         >= 4.11&& < 4.20,
 --                       blank-canvas,
---                       text         >= 1.1 && < 2.1
+--                       text         >= 1.1 && < 2.2
 --  hs-source-dirs:      audio
 --  default-language:    Haskell2010
 --  GHC-options:         -threaded -Wall
@@ -186,7 +186,7 @@ executable blank-canvas-example-bounce
 --  main-is:             Main.hs
 --  build-depends:       base         >= 4.11&& < 4.20,
 --                       blank-canvas,
---                       text         >= 1.1 && < 2.1
+--                       text         >= 1.1 && < 2.2
 --  hs-source-dirs:      bounceAudio
 --  default-language:    Haskell2010
 --  GHC-options:         -threaded -Wall
@@ -200,7 +200,7 @@ executable blank-canvas-example-bounce
 --  other-modules:       Paths_blank_canvas_examples
 --  build-depends:       base         >= 4.11&& < 4.20,
 --                       blank-canvas,
---                       text         >= 1.1 && < 2.1,
+--                       text         >= 1.1 && < 2.2,
 --                       stm          >= 2.2 && < 2.6
 --  hs-source-dirs:      playbar
 --  default-language:    Haskell2010
@@ -217,7 +217,7 @@ executable blank-canvas-example-cursor
                        base-compat >= 0.11 && < 0.14,
                        blank-canvas,
                        keys        >= 3.10,
-                       text        >= 1.1  && < 2.1
+                       text        >= 1.1  && < 2.2
   hs-source-dirs:      cursor
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
diff --git a/wiki-suite/wiki-suite.cabal b/wiki-suite/wiki-suite.cabal
@@ -30,7 +30,7 @@ executable wiki-suite
                       stm               >= 2.2  && < 2.6,
                       shake             >= 0.17 && < 0.20,
                       streams           >= 0.1,
-                      text              >= 1.1  && < 2.1,
+                      text              >= 1.1  && < 2.2,
                       time              >= 1.4  && < 1.13,
                       unix              >= 2.7  && < 2.9,
                       vector            >= 0.10 && < 0.14