Merge pull request #170 from qrilka/bump-ghcs

Bump GHC versions
qrilka · Jul 9, 2023 · debc1a6 · debc1a6
2 parents b17aa72 + ed6b239
commit debc1a6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -13,16 +13,16 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          stack-yaml: stack-lts-16.yaml
+          stack-yaml: stack-lts-19.yaml # GHC 9.0
           extra-args: ""
         - os: ubuntu-latest
-          stack-yaml: stack-lts-16.yaml
+          stack-yaml: stack-lts-19.yaml
           extra-args: "--flag xlsx:microlens"
         - os: ubuntu-latest
-          stack-yaml: stack-lts-17.yaml
+          stack-yaml: stack-lts-20.yaml # GHC 9.2
           extra-args: ""
         - os: ubuntu-latest
-          stack-yaml: stack-lts-19.yaml
+          stack-yaml: stack-lts-21.yaml # GHC 9.4
           extra-args: ""
         - os: ubuntu-latest
           stack-yaml: stack-nightly.yaml

diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml
@@ -1,3 +1,3 @@
-resolver: lts-19.0
+resolver: lts-19.33
 packages:
 - '.'
diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml
@@ -0,0 +1,3 @@
+resolver: lts-20.26
+packages:
+- '.'
diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml
@@ -0,0 +1,3 @@
+resolver: lts-21.1
+packages:
+- '.'
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2022-03-22
+resolver: nightly-2023-07-07
 packages:
 - '.'
diff --git a/test/StreamTests.hs b/test/StreamTests.hs
@@ -26,6 +26,7 @@ import Codec.Xlsx.Parser.Stream
 import Conduit ((.|))
 import qualified Conduit as C
 import Control.Lens hiding (indexed)
+import Control.Monad (void)
 import Data.Set.Lens
 import qualified Data.ByteString.Lazy as LB
 import qualified Data.ByteString as BS

diff --git a/xlsx.cabal b/xlsx.cabal
@@ -27,7 +27,7 @@ Maintainer:          qrilka@gmail.com
 
 Category:            Codec
 Build-type:          Simple
-Tested-with:         GHC == 8.8.4, GHC == 8.10.4, GHC == 9.0.2, GHC == 9.2.2
+Tested-with:         GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.5, GHC == 9.6.2
 Cabal-version:       >=1.10
 
 Flag microlens