From 6c05cb2b72aa0810a044ef74712ae47875c74713 Mon Sep 17 00:00:00 2001
From: Peter Lebbing <peter@digitalbrains.com>
Date: Fri, 31 May 2024 17:59:13 +0200
Subject: [PATCH] Support GHC 9.10 (#62)

And bump all CI tests to the latest minor versions

We checked Cabal/9.0.2 twice in CI, fixed

The build plan for HEAD.hackage is identical to the regular build plan
for GHC 9.10.1, so the `-upper` CI test is currently disabled as it
would merely duplicate the regular test.
---
 .ci/stack-9.4.yaml        |  2 +-
 .ci/stack-9.6.yaml        |  2 +-
 .ci/stack-9.8.yaml        |  2 +-
 .github/workflows/ci.yaml | 12 ++++++------
 docopt.cabal              | 11 ++++++-----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.ci/stack-9.4.yaml b/.ci/stack-9.4.yaml
index 65d1233..e955129 100644
--- a/.ci/stack-9.4.yaml
+++ b/.ci/stack-9.4.yaml
@@ -1,3 +1,3 @@
-resolver: lts-21.14
+resolver: lts-21.25
 ghc-options:
   "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.ci/stack-9.6.yaml b/.ci/stack-9.6.yaml
index 37115ae..7a6b21d 100644
--- a/.ci/stack-9.6.yaml
+++ b/.ci/stack-9.6.yaml
@@ -1,3 +1,3 @@
-resolver: lts-22.11
+resolver: lts-22.23
 ghc-options:
   "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.ci/stack-9.8.yaml b/.ci/stack-9.8.yaml
index f1f7dee..c01b764 100644
--- a/.ci/stack-9.8.yaml
+++ b/.ci/stack-9.8.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2024-02-24
+resolver: nightly-2024-05-31
 ghc-options:
   "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f604f17..b1cb37e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -84,17 +84,17 @@ jobs:
           - "8.8.4"
           - "8.10.7"
           - "9.0.2"
-          - "9.0.2"
           - "9.2.8"
-          - "9.4.7"
-          - "9.6.3"
-          - "9.8.1"
+          - "9.4.8"
+          - "9.6.5"
+          - "9.8.2"
+          - "9.10.1"
         project-variant: [""]
         include:
           - ghc: 8.0.2
             project-variant: -lower
-          - ghc: 9.8.1
-            project-variant: -upper
+          # - ghc: 9.10.1
+          #   project-variant: -upper
 
       fail-fast: false
     steps:
diff --git a/docopt.cabal b/docopt.cabal
index e7af16e..f8d2a62 100644
--- a/docopt.cabal
+++ b/docopt.cabal
@@ -17,9 +17,10 @@ tested-with:
   GHC == 8.10.7,
   GHC == 9.0.2,
   GHC == 9.2.8,
-  GHC == 9.4.7,
-  GHC == 9.6.3,
-  GHC == 9.8.1
+  GHC == 9.4.8,
+  GHC == 9.6.5,
+  GHC == 9.8.2,
+  GHC == 9.10.1
 
 category:            Console
 
@@ -42,7 +43,7 @@ source-repository head
 source-repository this
   type:       git
   location:   https://github.com/docopt/docopt.hs.git
-  tag:        v0.7.0.8
+  tag:        v0.7.0.8+r1
 
 library
   exposed-modules:    System.Console.Docopt.NoTH
@@ -60,7 +61,7 @@ library
   build-depends:      base >= 4.9 && < 5.0,
                       parsec >= 3.1.14 && < 3.2,
                       containers >= 0.6.2 && < 0.8,
-                      template-haskell >= 2.11.0 && < 2.22
+                      template-haskell >= 2.11.0 && < 2.23
 
   ghc-options:        -Wall -Wno-name-shadowing