Remove GHC <= 9.0 from the support window (#1778)

* Remove GHC <= 8.10.7 from the support window GHC <= 8.10.7 is removed from the support window. The lowest version supported in CI becomes GHC 9.2.1, released on the 29/10/2021. This grants us the ability to use `-XGHC2021` as default language, as well as `-XOverloadedRecordDot`. * Revise bounds for bytestring, containers and Cabal * More containers and bytestring bounds bumps
haskell-servant · Sep 12, 2024 · 87d449c · 87d449c
1 parent 1e3cbee
commit 87d449c
Show file tree

Hide file tree

Showing 42 changed files with 78 additions and 92 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,18 +1,18 @@
 packages:
   servant/
+  servant-client-core/
+  servant-client/
+  servant-server/
+
   servant-auth/servant-auth
   servant-auth/servant-auth-client
   servant-auth/servant-auth-docs
   servant-auth/servant-auth-server
   servant-auth/servant-auth-swagger
-
-  servant-client-core/
-  servant-client/
   servant-docs/
   servant-foreign/
   servant-http-streams/
   servant-quickcheck/
-  servant-server/
   servant-swagger/
 
   doc/tutorial/
@@ -83,3 +83,7 @@ allow-newer: vault:hashable
 allow-newer: psqueues:hashable
 allow-newer: insert-ordered-containers:hashable
 allow-newer: openapi3:hashable
+
+-- http2-5.3.3 is blacklisted, force http2-5.3.2 or http2-5.3.4
+constraints:
+  http2 ==5.3.2 || ==5.3.4
diff --git a/changelog.d/1778 b/changelog.d/1778
@@ -0,0 +1,8 @@
+synopsis: Remove GHC <= 8.10.7 from the support window
+prs: #1778
+
+description {
+  GHC <= 8.10.7 is removed from the support window. The lowest version supported in CI becomes GHC 9.2.1, released on the 26/05/2023
+
+  This grants us the ability to use -XGHC2021 as default language, as well as -XOverloadedRecordDot.
+}
diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-basic-auth
   main-is:             BasicAuth.lhs

diff --git a/doc/cookbook/basic-streaming/basic-streaming.cabal b/doc/cookbook/basic-streaming/basic-streaming.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-basic-streaming
   main-is:             Streaming.lhs

diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbock-curl-mock
   if impl(ghc >= 9.2)

diff --git a/doc/cookbook/custom-errors/custom-errors.cabal b/doc/cookbook/custom-errors/custom-errors.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-custom-errors
   main-is:             CustomErrors.lhs

diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-db-postgres-pool
   main-is:             PostgresPool.lhs

diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-db-sqlite-simple
   main-is:             DBConnection.lhs

diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-file-upload
   main-is:             FileUpload.lhs

diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-using-custom-monad
   main-is:             Generic.lhs

diff --git a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
@@ -11,7 +11,6 @@ author:              Servant Contributors
 maintainer:          [email protected]
 category:            Servant
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-hoist-server-with-context
   main-is:             HoistServerWithContext.lhs

diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-https
   main-is:             Https.lhs

diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
@@ -11,7 +11,6 @@ author:              Servant Contributors
 maintainer:          [email protected]
 category:            Servant
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-jwt-and-basic-auth
   main-is:             JWTAndBasicAuth.lhs

diff --git a/doc/cookbook/managed-resource/managed-resource.cabal b/doc/cookbook/managed-resource/managed-resource.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==9.4.2
 
 executable cookbook-managed-resource
   main-is:             ManagedResource.lhs

diff --git a/doc/cookbook/open-id-connect/OpenIdConnect.cabal b/doc/cookbook/open-id-connect/OpenIdConnect.cabal
@@ -8,7 +8,6 @@ license-file:   ../../../servant/LICENSE
 author:         Servant Contributors
 maintainer:     [email protected]
 build-type:     Simple
-tested-with:    GHC==8.6.5
 
 executable cookbook-openidconnect
   main-is: OpenIdConnect.lhs

diff --git a/doc/cookbook/openapi3/openapi3.cabal b/doc/cookbook/openapi3/openapi3.cabal
@@ -1,13 +1,13 @@
+cabal-version:       3.0
 name:                cookbook-openapi3
 version:             2.2
 synopsis:            OpenAPI 3.0 schema generation example
 homepage:            http://docs.servant.dev/
-license:             BSD3
+license:             BSD-3-Clause
 license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-cabal-version:       >=1.10
 
 executable cookbook-openapi3
   main-is:             OpenAPI.lhs

diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-pagination
   main-is:             Pagination.lhs

diff --git a/doc/cookbook/sentry/sentry.cabal b/doc/cookbook/sentry/sentry.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-sentry
   main-is:             Sentry.lhs

diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-structuring-apis
   main-is:             StructuringApis.lhs

diff --git a/doc/cookbook/testing/testing.cabal b/doc/cookbook/testing/testing.cabal
@@ -10,7 +10,6 @@ author:              Servant Contributors
 maintainer:          [email protected]
 category:            Servant
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-testing
   main-is:             Testing.lhs

diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-using-custom-monad
   main-is:             UsingCustomMonad.lhs

diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal
@@ -8,7 +8,6 @@ license-file:        ../../../servant/LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
 
 executable cookbook-using-free-client
   main-is:             UsingFreeClient.lhs

diff --git a/doc/cookbook/uverb/uverb.cabal b/doc/cookbook/uverb/uverb.cabal
@@ -10,7 +10,6 @@ author:              Servant Contributors
 maintainer:          [email protected]
 category:            Servant
 build-type:          Simple
-tested-with:         GHC==8.6.5, GHC==8.8.4, GHC==8.10.7
 
 executable cookbook-uverb
   main-is:             UVerb.lhs

diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal
@@ -12,9 +12,6 @@ license-file:        LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
-tested-with:
-  GHC==8.6.5
-  GHC==8.8.3, GHC ==8.10.7
 extra-source-files:
   static/index.html
   static/ui.js

diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal
@@ -16,7 +16,7 @@ maintainer:     [email protected]
 copyright:      (c) Julian K. Arni
 license:        BSD-3-Clause
 license-file:   LICENSE
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
+tested-with:    GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 build-type:     Simple
 extra-source-files:
     CHANGELOG.md
@@ -31,9 +31,9 @@ library
   default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
   ghc-options: -Wall
   build-depends:
-      base                >= 4.14     && < 4.21
-    , bytestring          >= 0.10.6.0 && < 0.13
-    , containers          >= 0.5.6.2  && < 0.8
+      base                >= 4.16.4.0 && < 4.21
+    , bytestring          >= 0.11 && < 0.13
+    , containers          >=0.6.5.1  && < 0.8
     , servant-auth        >= 0.4.2.0  && < 0.5
     , servant             >= 0.20.2   && < 0.21
     , servant-client-core >= 0.20.2   && < 0.21
@@ -54,7 +54,7 @@ test-suite spec
 
   -- dependencies with bounds inherited from the library stanza
   build-depends:
-      base
+      base >=4.16.4.0
     , servant-client
     , servant-auth
     , servant
@@ -65,7 +65,7 @@ test-suite spec
       hspec                >= 2.5.5    && < 2.12
     , QuickCheck           >= 2.11.3   && < 2.16
     , aeson                >= 1.3.1.1  && < 3
-    , bytestring           >= 0.10.6.0 && < 0.13
+    , bytestring           >= 0.11 && < 0.13
     , http-client          >= 0.5.13.1 && < 0.8
     , http-types           >= 0.12.2   && < 0.13
     , servant-auth-server  >= 0.4.2.0  && < 0.5

diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal
@@ -16,14 +16,15 @@ maintainer:     [email protected]
 copyright:      (c) Julian K. Arni
 license:        BSD-3-Clause
 license-file:   LICENSE
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
+tested-with:    GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 build-type:     Custom
 extra-source-files:
     CHANGELOG.md
 
 custom-setup
   setup-depends:
-    base < 4.21, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
+    base >= 4.16.4.0 && < 4.21,
+    Cabal < 4, cabal-doctest >=1.0.6 && <1.1
 
 source-repository head
   type: git
@@ -35,7 +36,7 @@ library
   default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
   ghc-options: -Wall
   build-depends:
-      base         >= 4.14    && < 4.21
+      base         >= 4.16.4.0 && < 4.21
     , servant-docs >= 0.13.1  && < 0.14
     , servant      >= 0.20.2  && < 0.21
     , servant-auth >= 0.4.2.0 && < 0.5

diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal
@@ -1,6 +1,6 @@
 cabal-version:  2.2
 name:           servant-auth-server
-version: 0.4.9.0
+version:        0.4.9.0
 synopsis:       servant-server/servant-auth compatibility
 description:    This package provides the required instances for using the @Auth@ combinator
                 in your 'servant' server.
@@ -16,7 +16,7 @@ maintainer:     [email protected]
 copyright:      (c) Julian K. Arni
 license:        BSD-3-Clause
 license-file:   LICENSE
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
+tested-with:    GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 build-type:     Simple
 extra-source-files:
     CHANGELOG.md
@@ -31,11 +31,11 @@ library
   default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
   ghc-options: -Wall
   build-depends:
-      base                    >= 4.14     && < 4.21
+      base                    >= 4.16.4.0 && < 4.21
     , aeson                   >= 1.0.0.1  && < 3
     , base64-bytestring       >= 1.0.0.1  && < 2
     , blaze-builder           >= 0.4.1.0  && < 0.5
-    , bytestring              >= 0.10.6.0 && < 0.13
+    , bytestring              >= 0.11 && < 0.13
     , case-insensitive        >= 1.2.0.11 && < 1.3
     , cookie                  >= 0.4.4    && < 0.6
     , data-default-class      >= 0.1.2.0  && < 0.2

diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
@@ -16,7 +16,7 @@ maintainer:     [email protected]
 copyright:      (c) Julian K. Arni
 license:        BSD-3-Clause
 license-file:   LICENSE
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
+tested-with:    GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 build-type:     Simple
 extra-source-files:
     CHANGELOG.md
@@ -31,7 +31,7 @@ library
   default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
   ghc-options: -Wall
   build-depends:
-      base            >= 4.14    && < 4.21
+      base            >= 4.16.4.0 && < 4.21
     , text            >= 1.2.3.0 && < 2.2
     , servant-swagger >= 1.2.1   && < 2
     , swagger2        >= 2.2.2   && < 3

diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal
@@ -18,7 +18,7 @@ maintainer:     [email protected]
 copyright:      (c) Julian K. Arni
 license:        BSD-3-Clause
 license-file:   LICENSE
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
+tested-with:    GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 build-type:     Simple
 extra-source-files:
     CHANGELOG.md
@@ -33,8 +33,8 @@ library
   default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
   ghc-options: -Wall
   build-depends:
-      base                    >= 4.14     && < 4.21
-    , containers              >= 0.6      && < 0.8
+      base                    >= 4.16.4.0 && < 4.21
+    , containers              >=0.6.5.1   && < 0.8
     , aeson                   >= 2.0      && < 3
     , jose                    >= 0.10     && < 0.12
     , lens                    >= 4.16.1   && < 5.4

diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
@@ -20,7 +20,7 @@ copyright:
 
 build-type:         Simple
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
+  GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -102,10 +102,10 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-    , base              >=4.14     && <4.21
-    , bytestring        >=0.10.8.1 && <0.13
+      base              >= 4.16.4.0 && < 4.21
+    , bytestring        >=0.11 && <0.13
     , constraints       >=0.2      && <0.15
-    , containers        >=0.5.7.1  && <0.8
+    , containers        >=0.6.5.1  && <0.8
     , deepseq           >=1.4.2.0  && <1.6
     , template-haskell  >=2.11.1.0 && <2.23
     , text              >=1.2.3.0  && <2.2

diff --git a/servant-client-ghcjs/servant-client-ghcjs.cabal b/servant-client-ghcjs/servant-client-ghcjs.cabal
@@ -21,7 +21,6 @@ author:             Servant Contributors
 maintainer:         [email protected]
 copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2018 Servant Contributors
 build-type:         Simple
-tested-with:        ghc >=7.8
 extra-source-files:
   CHANGELOG.md
   README.md