Merge pull request #160 from TripShot/bump-deps

Bump deps
snapframework · Apr 27, 2024 · 51c90f6 · 51c90f6
2 parents adca089 + e0f47b7
commit 51c90f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,10 +33,10 @@ jobs:
           - "9.4"
           - "9.6"
           - "9.8"
-        include:
-          - { os: macOS-latest,   ghc: "9.8" }
-          # HsOpenSSL fails to build on Windows without openssl.
-          # - { os: windows-latest, ghc: "9.6" }
+        # TODO: HsOpenSSL fails to build on Windows and macOS without openssl.
+        # include:
+        #  - { os: macOS-latest,   ghc: "9.8" }
+        #  - { os: windows-latest, ghc: "9.8" }
 
     steps:
       - uses: actions/checkout@v3
@@ -53,7 +53,7 @@ jobs:
           cabal build --dry-run
 
       - name: Restore cached dependencies
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         id: cache
         env:
           key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
@@ -66,7 +66,7 @@ jobs:
         run: cabal build all --only-dependencies
 
       - name: Save cached dependencies
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: ${{ steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
         with:
           path: ${{ steps.setup.outputs.cabal-store }}
@@ -91,7 +91,7 @@ jobs:
         include:
           # GHC version must match https://www.stackage.org/nightly
           - stack: "latest"
-            ghc: "9.6"
+            ghc: "9.8"
 
     steps:
       - uses: actions/checkout@v3
@@ -115,7 +115,7 @@ jobs:
           stack config set system-ghc true --global
           stack config set resolver nightly
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Cache
         with:
           path: |

diff --git a/snap-server.cabal b/snap-server.cabal
@@ -106,11 +106,11 @@ Library
     io-streams-haproxy                  >= 1.0      && < 1.1,
     lifted-base                         >= 0.1      && < 0.3,
     mtl                                 >= 2.0      && < 2.4,
-    network                             >= 2.3      && < 3.2,
+    network                             >= 2.3      && < 4,
     old-locale                          >= 1.0      && < 1.1,
     snap-core                           >= 1.0      && < 1.1,
     text                                >= 0.11     && < 2.2,
-    time                                >= 1.0      && < 1.13,
+    time                                >= 1.0      && < 2,
     transformers                        >= 0.3      && < 0.7,
     unix-compat                         >= 0.2      && < 0.8,
     vector                              >= 0.7      && < 0.14