From 9f27aabf990a5df8d1aa53eea4a21b91359fe05a Mon Sep 17 00:00:00 2001
From: Marco Perone <marco.perone@tweag.io>
Date: Tue, 14 Mar 2023 11:49:24 +0100
Subject: [PATCH] test on ghc 9.6.1 and cabal 3.10.0.1

---
 .github/workflows/ci.yml | 22 ++++++++++++++++++----
 cabal.project            |  2 +-
 crem.cabal               | 14 +++++++-------
 package.yaml             | 14 +++++++-------
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7cdd512..ac23329 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['9.0.2', '9.2.7', '9.4.4']
-        cabal: ['3.8.1.0', '3.6.2.0', '3.4.1.0']
+        ghc: ['9.0.2', '9.2.7', '9.4.4', '9.6.1']
+        cabal: ['3.4.1.0', '3.6.2.0', '3.8.1.0', '3.10.1.0']
         os: ['ubuntu-latest', 'macos-latest']
         exclude:
           # Cabal 3.4.1.0 supports GHC version < 9.1
@@ -22,8 +22,15 @@ jobs:
             ghc: '9.2.7'
           - cabal: '3.4.1.0'
             ghc: '9.4.4'
+          - cabal: '3.4.1.0'
+            ghc: '9.6.1'
+          # Cabal 3.6.2.0 supports GHC version < 9.4
+          - cabal: '3.6.2.0'
+            ghc: '9.4.4'
+          - cabal: '3.6.2.0'
+            ghc: '9.6.1'
     runs-on: ${{ matrix.os }}
-    name: Build and test with cabal ${{ matrix.cabal }} and GHC ${{ matrix.ghc }} on ${{ matrix.os }}
+    name: platform ${{ matrix.os }} GHC ${{ matrix.ghc }} cabal ${{ matrix.cabal }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -42,6 +49,9 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
           restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
 
+      - name: Update cabal package list
+        run: cabal update
+
       - name: Build dependencies
         run: cabal build --only-dependencies
 
@@ -51,5 +61,9 @@ jobs:
       - name: Test on current dependencies
         run: cabal test
 
-      - name: Test on HEAD dependencies
+      - name: Test on most recent dependencies
         run: cabal test --index-state HEAD
+
+      - name: Test on oldest dependencies
+        if: matrix.cabal == '3.10.1.0'
+        run: cabal test --prefer-oldest
diff --git a/cabal.project b/cabal.project
index 0fa4bb4..d16e11e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,3 +1,3 @@
-index-state: 2023-03-09T07:24:13Z
+index-state: 2023-03-14T09:58:19Z
 packages: *.cabal
 write-ghc-environment-files: always
diff --git a/crem.cabal b/crem.cabal
index 141ca94..26496ac 100644
--- a/crem.cabal
+++ b/crem.cabal
@@ -34,7 +34,7 @@ library
   build-depends:
       base >=4.15 && <4.19
     , profunctors >=3.2 && <5.7
-    , singletons-base >=3.0 && <3.2
+    , singletons-base >=3.0 && <3.3
     , text >=1.2 && <2.1
   default-language: Haskell2010
   if impl(ghc >= 9.2)
@@ -114,9 +114,9 @@ library crem-examples
   build-depends:
       base >=4.15 && <4.19
     , crem
-    , profunctors >=3.2 && <5.7
-    , singletons-base >=3.0 && <3.2
-    , text >=1.2 && <2.1
+    , profunctors
+    , singletons-base
+    , text
   default-language: Haskell2010
   if impl(ghc >= 9.2)
     ghc-options: -Wno-missing-kind-signatures
@@ -247,7 +247,7 @@ executable hobbit-map
       base >=4.15 && <4.19
     , crem
     , crem-examples
-    , text >=1.2 && <2.1
+    , text
   default-language: Haskell2010
   if impl(ghc >= 9.2)
     ghc-options: -Wno-missing-kind-signatures
@@ -391,8 +391,8 @@ test-suite crem-spec
     , crem
     , crem-examples
     , hspec >=2.7 && <2.11
-    , profunctors >=3.2 && <5.7
-    , singletons-base >=3.0 && <3.2
+    , profunctors
+    , singletons-base
   default-language: Haskell2010
   if impl(ghc >= 9.2)
     ghc-options: -Wno-missing-kind-signatures
diff --git a/package.yaml b/package.yaml
index 95d5f91..e6a61f3 100644
--- a/package.yaml
+++ b/package.yaml
@@ -97,7 +97,7 @@ library:
   source-dirs:      src
   dependencies:
     - profunctors >= 3.2 && < 5.7
-    - singletons-base >= 3.0 && < 3.2
+    - singletons-base >= 3.0 && < 3.3
     - text >= 1.2 && < 2.1
   # Disable adding Paths_crem to other-modules, because it does not conform to our style guide.
   # https://github.com/sol/hpack#handling-of-paths_-modules
@@ -110,9 +110,9 @@ internal-libraries:
     source-dirs:      examples
     dependencies:
       - crem
-      - profunctors >= 3.2 && < 5.7
-      - singletons-base >= 3.0 && < 3.2
-      - text >= 1.2 && < 2.1
+      - profunctors
+      - singletons-base
+      - text
     # Disable adding Paths_crem to other-modules, because it does not conform to our style guide.
     # https://github.com/sol/hpack#handling-of-paths_-modules
     when:
@@ -127,8 +127,8 @@ tests:
       - crem
       - crem-examples
       - hspec >= 2.7 && < 2.11
-      - profunctors >= 3.2 && < 5.7
-      - singletons-base >= 3.0 && < 3.2
+      - profunctors
+      - singletons-base
     build-tools: hspec-discover:hspec-discover
     when:
     - condition: false
@@ -167,7 +167,7 @@ executables:
     dependencies:
       - crem
       - crem-examples
-      - text >= 1.2 && < 2.1
+      - text
     # Disable adding Paths_crem to other-modules, because it does not conform to our style guide.
     # https://github.com/sol/hpack#handling-of-paths_-modules
     when: