Merge branch 'develop' into TextAlignConsolidate

.github/workflows/haskell.yml

@@ -1,33 +1,33 @@
-name: Haskell CI
+name: github-action
 
 on: [push, pull_request]
 
 jobs:
   build:
-
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ghc: ['8.4.4', '8.6.5', '8.8.4']
+        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
         os: ['ubuntu-latest', 'macos-latest']
+    runs-on: ${{ matrix.os }}
+
+    name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-haskell@v1
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.0'
-
     - name: Cache
       uses: actions/cache@v1
       env:
         cache-name: cache-cabal
       with:
         path: ~/.cabal
-        key: ${{ runner.os }}-1-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
         restore-keys: |
-          ${{ runner.os }}-1-build-${{ env.cache-name }}-
-          ${{ runner.os }}-1-build-
-          ${{ runner.os }}-1-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-
+          ${{ runner.os }}-${{ matrix.ghc }}-
+          ${{ runner.os }}
 
     - name: Install dependencies
       run: |
@@ -37,3 +37,5 @@ jobs:
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
       run: cabal test all
+    - name: Build Docs
+      run: cabal haddock

reflex-vty.cabal

@@ -17,7 +17,12 @@ extra-source-files:
   README.md
   ChangeLog.md
 extra-doc-files: doc/tasks.png
-tested-with: GHC ==8.8.4 || ==8.6.5 || ==8.4.4
+tested-with:
+  GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
+
+source-repository head
+  type: git
+  location: https://github.com/reflex-frp/reflex-vty
 
 library
   exposed-modules: Reflex.Vty
@@ -34,8 +39,8 @@ library
                  , Reflex.Spider.Orphans
                  , Control.Monad.NodeId
   build-depends:
-    base >= 4.10.0 && < 4.14,
-    bimap >= 0.3.3 && < 0.4,
+    base >= 4.10.0 && < 4.15,
+    bimap >= 0.3.3 && < 0.5,
     containers >= 0.5.0 && < 0.7,
     mtl >= 2.2.2 && < 2.3,
     transformers >= 0.5.5 && < 0.6,
@@ -147,7 +152,3 @@ test-suite reflex-vty-test
     extra,
     hspec >= 2.7 && < 2.8
   default-language: Haskell2010
-
-source-repository head
-  type: git
-  location: https://github.com/reflex-frp/reflex-vty