Merge pull request #159 from TripShot/ghc-9.8

GHC 9.8
snapframework · Oct 23, 2023 · adca089 · adca089
2 parents d779078 + 45a4edc
commit adca089
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,16 +32,17 @@ jobs:
           - "9.2"
           - "9.4"
           - "9.6"
+          - "9.8"
         include:
-          - { os: macOS-latest,   ghc: "9.6" }
+          - { os: macOS-latest,   ghc: "9.8" }
           # HsOpenSSL fails to build on Windows without openssl.
           # - { os: windows-latest, ghc: "9.6" }
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up GHC ${{ matrix.ghc-version }}
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         id: setup
         with:
           ghc-version: ${{ matrix.ghc }}
@@ -95,7 +96,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: haskell/actions/setup@v2
+      - uses: haskell-actions/setup@v2
         name: Setup Haskell Stack
         with:
           ghc-version: ${{ matrix.ghc }}
@@ -119,8 +120,7 @@ jobs:
         with:
           path: |
             ~/.stack
-          key: ${{ runner.os }}-${{ matrix.ghc }}-stack
-
+          key: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-stack
 
       - name: Install dependencies
         run: |

diff --git a/snap-server.cabal b/snap-server.cabal
@@ -37,8 +37,9 @@ tested-with:
   GHC == 8.10.7
   GHC == 9.0.2
   GHC == 9.2.8
-  GHC == 9.4.5
-  GHC == 9.6.2
+  GHC == 9.4.7
+  GHC == 9.6.3
+  GHC == 9.8.1
 
 Flag portable
   Description: Compile in cross-platform mode. No platform-specific code or
@@ -99,7 +100,7 @@ Library
     bytestring                          >= 0.9.1    && < 0.13,
     case-insensitive                    >= 1.1      && < 1.3,
     clock                               >= 0.7.1    && < 0.9,
-    containers                          >= 0.3      && < 0.7,
+    containers                          >= 0.3      && < 0.8,
     filepath                            >= 1.1      && < 2.0,
     io-streams                          >= 1.3      && < 1.6,
     io-streams-haproxy                  >= 1.0      && < 1.1,
@@ -108,7 +109,7 @@ Library
     network                             >= 2.3      && < 3.2,
     old-locale                          >= 1.0      && < 1.1,
     snap-core                           >= 1.0      && < 1.1,
-    text                                >= 0.11     && < 2.1,
+    text                                >= 0.11     && < 2.2,
     time                                >= 1.0      && < 1.13,
     transformers                        >= 0.3      && < 0.7,
     unix-compat                         >= 0.2      && < 0.8,
@@ -211,8 +212,6 @@ Test-suite testsuite
     Test.Common.TestHandler
 
   build-depends:
-    -- aeson dependency needed until http-streams depends on an unreleased attoparsec-aeson.
-    aeson                               >= 0.9.0.0 && < 2.2.0.0,
     attoparsec,
     base,
     base16-bytestring                   >= 0.1      && < 1.1,