From b1182e6438e1e4075155b403c32fe3acd9c19f52 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Sun, 27 Aug 2023 20:44:26 +0200
Subject: [PATCH] Allow text-2.1; bump CI to GHC 9.4.7

Also drop CI support for GHC 7.6 and 7.8
---
 .github/workflows/haskell-ci.yml            | 53 +++++----------------
 .gitignore                                  |  7 +--
 cabal.haskell-ci                            |  3 +-
 microlens-contra/microlens-contra.cabal     | 25 +++++-----
 microlens-ghc/microlens-ghc.cabal           | 27 +++++------
 microlens-mtl/microlens-mtl.cabal           | 25 +++++-----
 microlens-platform/microlens-platform.cabal | 27 +++++------
 microlens-th/microlens-th.cabal             | 25 +++++-----
 microlens/microlens.cabal                   | 25 +++++-----
 9 files changed, 93 insertions(+), 124 deletions(-)

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index a08d6c2..8a33386 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -6,22 +6,20 @@
 #
 #   haskell-ci regenerate
 #
-# For more information, see https://github.com/haskell-CI/haskell-ci
+# For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20230817
+# version: 0.17.20231010
 #
-# REGENDATA ("0.17.20230817",["github","cabal.project"])
+# REGENDATA ("0.17.20231010",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
   push:
     branches:
       - master
-      - ci*
   pull_request:
     branches:
       - master
-      - ci*
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -29,24 +27,24 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:bionic
+      image: buildpack-deps:focal
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.0.20230809
+          - compiler: ghc-9.8.1
             compilerKind: ghc
-            compilerVersion: 9.8.0.20230809
+            compilerVersion: 9.8.1
             setup-method: ghcup
-            allow-failure: true
-          - compiler: ghc-9.6.2
+            allow-failure: false
+          - compiler: ghc-9.6.3
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.6.3
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.6
+          - compiler: ghc-9.4.7
             compilerKind: ghc
-            compilerVersion: 9.4.6
+            compilerVersion: 9.4.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.2.8
@@ -94,16 +92,6 @@ jobs:
             compilerVersion: 7.10.3
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-7.8.4
-            compilerKind: ghc
-            compilerVersion: 7.8.4
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.6.3
-            compilerKind: ghc
-            compilerVersion: 7.6.3
-            setup-method: hvr-ppa
-            allow-failure: false
       fail-fast: false
     steps:
       - name: apt
@@ -158,7 +146,7 @@ jobs:
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
-          if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
@@ -187,18 +175,6 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
-          if $HEADHACKAGE; then
-          cat >> $CABAL_CONFIG <<EOF
-          repository head.hackage.ghc.haskell.org
-             url: https://ghc.gitlab.haskell.org/head.hackage/
-             secure: True
-             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-             key-threshold: 3
-          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
-          EOF
-          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -222,7 +198,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -280,9 +256,6 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
-          if $HEADHACKAGE; then
-          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
-          fi
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(microlens|microlens-contra|microlens-ghc|microlens-mtl|microlens-platform|microlens-th)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
diff --git a/.gitignore b/.gitignore
index 4677874..72d0c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 dist/
 dist-newstyle/
-cabal-dev
+.stack-work/
+.ghc.environment.*
 *.o
 *.hi
 *.chi
@@ -10,9 +11,9 @@ cabal-dev
 .cabal-sandbox/
 cabal.sandbox.config
 cabal.config
+cabal-dev
+stack*.yaml.lock
 TAGS
 .DS_Store
 *~
 *#
-.stack-work/
-dist-newstyle/
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index 19f250e..56918bc 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -1,3 +1,4 @@
-branches: master ci*
+branches: master
 
 haddock: <8.1 || >8.3
+
diff --git a/microlens-contra/microlens-contra.cabal b/microlens-contra/microlens-contra.cabal
index 90c3503..b4ddf9a 100644
--- a/microlens-contra/microlens-contra.cabal
+++ b/microlens-contra/microlens-contra.cabal
@@ -20,20 +20,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git
diff --git a/microlens-ghc/microlens-ghc.cabal b/microlens-ghc/microlens-ghc.cabal
index 500b6bf..6faf593 100644
--- a/microlens-ghc/microlens-ghc.cabal
+++ b/microlens-ghc/microlens-ghc.cabal
@@ -18,20 +18,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git
@@ -44,7 +43,7 @@ library
   -- other-extensions:
   build-depends:       array >=0.3.0.2 && <0.6
                      , base >=4.5 && <5
-                     , bytestring >=0.9.2.1 && <0.12
+                     , bytestring >=0.9.2.1 && <0.13
                      , containers >=0.4.0 && <0.7
                      , microlens ==0.4.13.*
                      , transformers >=0.2 && <0.7
diff --git a/microlens-mtl/microlens-mtl.cabal b/microlens-mtl/microlens-mtl.cabal
index ac16afd..60e8c0c 100644
--- a/microlens-mtl/microlens-mtl.cabal
+++ b/microlens-mtl/microlens-mtl.cabal
@@ -17,20 +17,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git
diff --git a/microlens-platform/microlens-platform.cabal b/microlens-platform/microlens-platform.cabal
index 5d22f13..d512b91 100644
--- a/microlens-platform/microlens-platform.cabal
+++ b/microlens-platform/microlens-platform.cabal
@@ -18,20 +18,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git
@@ -48,7 +47,7 @@ library
                      , microlens-ghc ==0.4.14.*
                      , microlens-mtl ==0.2.0.*
                      , microlens-th ==0.4.3.*
-                     , text >=0.11 && <1.3 || >=2.0 && <2.1
+                     , text >=0.11 && <1.3 || >=2.0 && <2.2
                      , unordered-containers >=0.2.4 && <0.3
                      , vector >=0.9 && <0.14
 
diff --git a/microlens-th/microlens-th.cabal b/microlens-th/microlens-th.cabal
index 332f7dd..3319b22 100644
--- a/microlens-th/microlens-th.cabal
+++ b/microlens-th/microlens-th.cabal
@@ -16,20 +16,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git
diff --git a/microlens/microlens.cabal b/microlens/microlens.cabal
index 6285c5d..1d47235 100644
--- a/microlens/microlens.cabal
+++ b/microlens/microlens.cabal
@@ -41,20 +41,19 @@ build-type:          Simple
 extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC==7.6.3
-                     GHC==7.8.4
-                     GHC==7.10.3
-                     GHC==8.0.2
-                     GHC==8.2.2
-                     GHC==8.4.4
-                     GHC==8.6.5
-                     GHC==8.8.4
-                     GHC==8.10.7
-                     GHC==9.0.2
+tested-with:
+                     GHC==9.8.1
+                     GHC==9.6.3
+                     GHC==9.4.7
                      GHC==9.2.8
-                     GHC==9.4.6
-                     GHC==9.6.2
-                     GHC==9.8.0
+                     GHC==9.0.2
+                     GHC==8.10.7
+                     GHC==8.8.4
+                     GHC==8.6.5
+                     GHC==8.4.4
+                     GHC==8.2.2
+                     GHC==8.0.2
+                     GHC==7.10.3
 
 source-repository head
   type:                git