From 8cd8c80507c8e18459bc997ad6063b615eaf7c05 Mon Sep 17 00:00:00 2001
From: Tom Ellis <tom-git@jaguarpaw.co.uk>
Date: Mon, 6 Nov 2023 10:18:10 +0000
Subject: [PATCH] Support GHC 9.6 and 9.8

---
 .github/workflows/ci.yml   | 15 ++++++++++++++-
 validation-selective.cabal | 14 +++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a655e51..28e6a49 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.8"]
+        # We must always use the latest version of cabal because
+        # otherwise ghc-paths, which is a dependency of doctest,
+        # can't be configured.
+        cabal: ["3.10"]
         ghc:
           - "8.6.5"
           - "8.8.4"
@@ -24,7 +27,13 @@ jobs:
           - "9.0.2"
           - "9.2.7"
           - "9.4.4"
+          - "9.6.3"
+          - "9.8.1"
         exclude:
+          - os: macOS-latest
+            ghc: 9.6.3
+          - os: macOS-latest
+            ghc: 9.4.4
           - os: macOS-latest
             ghc: 9.2.7
           - os: macOS-latest
@@ -36,6 +45,10 @@ jobs:
           - os: macOS-latest
             ghc: 8.6.5
 
+          - os: windows-latest
+            ghc: 9.6.3
+          - os: windows-latest
+            ghc: 9.4.4
           - os: windows-latest
             ghc: 9.2.7
           - os: windows-latest
diff --git a/validation-selective.cabal b/validation-selective.cabal
index 3d75fad..fe6d4b3 100644
--- a/validation-selective.cabal
+++ b/validation-selective.cabal
@@ -37,7 +37,7 @@ source-repository head
   location:            https://github.com/kowainik/validation-selective.git
 
 common common-options
-  build-depends:       base >= 4.12 && < 4.18
+  build-depends:       base >= 4.12 && < 4.20
 
   ghc-options:         -Wall
                        -Wcompat
@@ -79,7 +79,7 @@ library
   hs-source-dirs:      src
   exposed-modules:     Validation
                          Validation.Combinators
-  build-depends:       deepseq ^>= 1.4.3.0
+  build-depends:       deepseq >= 1.4.3.0 && < 1.6
                      , selective >= 0.3 && < 0.7
 
 test-suite validation-selective-test
@@ -91,11 +91,11 @@ test-suite validation-selective-test
                        Test.Laws
                        Test.Properties
   build-depends:       validation-selective
-                     , hedgehog >= 1.0 && < 1.3
-                     , hspec >= 2.7.1 && < 2.11
-                     , hspec-hedgehog ^>= 0.0.1.1
+                     , hedgehog >= 1.0 && < 1.5
+                     , hspec >= 2.7.1 && < 2.12
+                     , hspec-hedgehog >= 0.0.1.1 && < 0.2
                      , selective
-                     , text >= 1.2.3 && < 2.1
+                     , text >= 1.2.3 && < 2.2
   ghc-options:         -threaded
                        -rtsopts
                        -with-rtsopts=-N
@@ -105,5 +105,5 @@ test-suite validation-selective-doctest
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   main-is:             Doctest.hs
-  build-depends:       doctest >= 0.16 && < 0.22
+  build-depends:       doctest >= 0.16 && < 0.23
   ghc-options:         -threaded