Allow building with text-2.0.*

aavogt · Dec 26, 2021 · abe5262 · abe5262
1 parent a6c7269
commit abe5262
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/blank-canvas.cabal b/blank-canvas.cabal
@@ -91,7 +91,7 @@ Library
                        scotty                 >= 0.10    && < 0.13,
                        semigroups             >= 0.18    && < 1,
                        stm                    >= 2.2     && < 2.6,
-                       text                   >= 1.1     && < 1.3,
+                       text                   >= 1.1     && < 2.1,
                        text-show              >= 2       && < 4,
                        transformers           >= 0.3     && < 0.6,
                        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: a13cd9e59d3011ba8ef04628ec439d2b629a42e6
+  tag: 0357ff95973a5bd82c91f92b58654a7165d2950f
diff --git a/examples/blank-canvas-examples.cabal b/examples/blank-canvas-examples.cabal
@@ -61,7 +61,7 @@ executable blank-canvas-example-html5canvastutorial
   build-depends:       base        >= 4.11 && < 4.16,
                        base-compat >= 0.11 && < 0.13,
                        blank-canvas,
-                       text        >= 1.1  && < 1.3
+                       text        >= 1.1  && < 2.1
   hs-source-dirs:      html5canvastutorial
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -75,7 +75,7 @@ executable blank-canvas-example-keyread
   build-depends:       base        >= 4.11 && < 4.16,
                        base-compat >= 0.11 && < 0.13,
                        blank-canvas,
-                       text        >= 1.1  && < 1.3
+                       text        >= 1.1  && < 2.1
   hs-source-dirs:      keyread
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -127,7 +127,7 @@ executable blank-canvas-example-text
   build-depends:       base        >= 4.11 && < 4.16,
                        base-compat >= 0.11 && < 0.13,
                        blank-canvas,
-                       text        >= 1.1  && < 1.3
+                       text        >= 1.1  && < 2.1
   hs-source-dirs:      text
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -141,7 +141,7 @@ executable blank-canvas-example-tictactoe
   build-depends:       base         >= 4.11&& < 4.16,
                        blank-canvas,
                        containers   >= 0.5 && < 0.7,
-                       text         >= 1.1 && < 1.3
+                       text         >= 1.1 && < 2.1
   hs-source-dirs:      tictactoe
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -155,7 +155,7 @@ executable blank-canvas-example-bounce
   main-is:             Main.hs
   build-depends:       base         >= 4.11&& < 4.16,
                        blank-canvas,
-                       text         >= 1.1 && < 1.3
+                       text         >= 1.1 && < 2.1
   hs-source-dirs:      bounce
   default-language:    Haskell2010
   GHC-options:         -threaded -Wall
@@ -169,7 +169,7 @@ executable blank-canvas-example-bounce
 --  other-modules:       Paths_blank_canvas_examples
 --  build-depends:       base         >= 4.11&& < 4.16,
 --                       blank-canvas,
---                       text         >= 1.1 && < 1.3
+--                       text         >= 1.1 && < 2.1
 --  hs-source-dirs:      audio
 --  default-language:    Haskell2010
 --  GHC-options:         -threaded -Wall
@@ -182,7 +182,7 @@ executable blank-canvas-example-bounce
 --  main-is:             Main.hs
 --  build-depends:       base         >= 4.11&& < 4.16,
 --                       blank-canvas,
---                       text         >= 1.1 && < 1.3
+--                       text         >= 1.1 && < 2.1
 --  hs-source-dirs:      bounceAudio
 --  default-language:    Haskell2010
 --  GHC-options:         -threaded -Wall
@@ -196,7 +196,7 @@ executable blank-canvas-example-bounce
 --  other-modules:       Paths_blank_canvas_examples
 --  build-depends:       base         >= 4.11&& < 4.16,
 --                       blank-canvas,
---                       text         >= 1.1 && < 1.3,
+--                       text         >= 1.1 && < 2.1,
 --                       stm          >= 2.2 && < 2.6
 --  hs-source-dirs:      playbar
 --  default-language:    Haskell2010
@@ -213,7 +213,7 @@ executable blank-canvas-example-cursor
                        base-compat >= 0.11 && < 0.13,
                        blank-canvas,
                        keys        >= 3.10,
-                       text        >= 1.1  && < 1.3
+                       text        >= 1.1  && < 2.1
   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
@@ -26,7 +26,7 @@ executable wiki-suite
                       process           >= 1.2  && < 1.7,
                       stm               >= 2.2  && < 2.6,
                       shake             >= 0.17 && < 0.20,
-                      text              >= 1.1  && < 1.3,
+                      text              >= 1.1  && < 2.1,
                       time              >= 1.4  && < 1.10,
                       unix              >= 2.7  && < 2.8,
                       vector            >= 0.10 && < 0.13