Merge pull request #1765 from haskell-servant/allow-ghc-9.10

Allow GHC 9.10
haskell-servant · Jun 22, 2024 · 3d37521 · 3d37521
2 parents 3940521 + 86aaa91
commit 3d37521
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 37 deletions.
diff --git a/cabal.project b/cabal.project
@@ -69,3 +69,29 @@ if(impl(ghc >= 9.6.1))
 
   package servant-server
     ghc-options: -fprint-redundant-promotion-ticks
+
+allow-newer: postgresql-simple:base
+allow-newer: postgresql-simple:template-haskell
+allow-newer: postgresql-simple:containers
+allow-newer: postgresql-libpq:base
+allow-newer: servant-swagger-ui:base
+allow-newer: servant-swagger-ui-core:base
+allow-newer: file-embed-lzma:base
+allow-newer: file-embed-lzma:template-haskell
+allow-newer: file-embed-lzma:filepath
+allow-newer: lzma:base
+allow-newer: servant-openapi3:base
+allow-newer: insert-ordered-containers:base
+allow-newer: insert-ordered-containers:lens
+allow-newer: openapi3:base
+allow-newer: openapi3:template-haskell
+allow-newer: swagger2:base
+allow-newer: swagger2:template-haskell
+allow-newer: swagger2:lens
+allow-newer: swagger2:containers
+allow-newer: pipes-safe:base
+allow-newer: servant-js:base
+allow-newer: servant-js:lens
+allow-newer: lucid:base
+allow-newer: stringsearch:containers
+allow-newer: Cabal
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
+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
 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.10     && < 4.20
+      base                >= 4.10     && < 4.21
     , bytestring          >= 0.10.6.0 && < 0.13
-    , containers          >= 0.5.6.2  && < 0.7
+    , containers          >= 0.5.6.2  && < 0.8
     , servant-auth        == 0.4.*
     , servant             >= 0.13     && < 0.21
     , servant-client-core >= 0.13     && < 0.21

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,14 @@ 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
+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
 build-type:     Custom
 extra-source-files:
     CHANGELOG.md
 
 custom-setup
   setup-depends:
-    base < 4.20, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
+    base < 4.21, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
 
 source-repository head
   type: git
@@ -35,7 +35,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.10    && < 4.20
+      base         >= 4.10    && < 4.21
     , servant-docs >= 0.13    && < 0.14
     , servant      >= 0.13    && < 0.21
     , servant-auth == 0.4.*

diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.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
+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
 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.10     && < 4.20
+      base                    >= 4.10     && < 4.21
     , aeson                   >= 1.0.0.1  && < 3
     , base64-bytestring       >= 1.0.0.1  && < 2
     , blaze-builder           >= 0.4.1.0  && < 0.5

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
+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
 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.10    && < 4.20
+      base            >= 4.10    && < 4.21
     , text            >= 1.2.3.0 && < 2.2
     , servant-swagger >= 1.1.5   && < 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
+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
 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.10     && < 4.20
-    , containers              >= 0.6      && < 0.7
+      base                    >= 4.10     && < 4.21
+    , containers              >= 0.6      && < 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
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -102,12 +102,12 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-    , base              >=4.9      && <4.20
+    , base              >=4.9      && <4.21
     , bytestring        >=0.10.8.1 && <0.13
     , constraints       >=0.2      && <0.15
-    , containers        >=0.5.7.1  && <0.7
+    , containers        >=0.5.7.1  && <0.8
     , deepseq           >=1.4.2.0  && <1.6
-    , template-haskell  >=2.11.1.0 && <2.22
+    , template-haskell  >=2.11.1.0 && <2.23
     , text              >=1.2.3.0  && <2.2
 
   -- Servant dependencies

diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
@@ -22,7 +22,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
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -94,9 +94,9 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-    , base          >=4.9      && <4.20
+    , base          >=4.9      && <4.21
     , bytestring    >=0.10.8.1 && <0.13
-    , containers    >=0.5.7.1  && <0.7
+    , containers    >=0.5.7.1  && <0.8
     , deepseq       >=1.4.2.0  && <1.6
     , mtl           ^>=2.2.2   || ^>=2.3.1
     , stm           >=2.4.5.1  && <2.6

diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
@@ -19,7 +19,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 copyright:           2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
 build-type:          Simple
-tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
+tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -41,7 +41,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base       >= 4.9      && < 4.20
+      base       >= 4.9      && < 4.21
     , bytestring >= 0.10.8.1 && < 0.13
     , text       >= 1.2.3.0  && < 2.2
 

diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal
@@ -21,7 +21,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 copyright:           2015-2019 Servant Contributors
 build-type:          Simple
-tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
+tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -41,7 +41,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base        >= 4.9     && < 4.20
+      base        >= 4.9     && < 4.21
     , text        >= 1.2.3.0 && < 2.2
 
   -- Servant dependencies

diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal
@@ -20,7 +20,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 copyright:           2019 Servant Contributors
 build-type:          Simple
-tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
+tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -38,9 +38,9 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-      base                  >= 4.9      && < 4.20
+      base                  >= 4.9      && < 4.21
     , bytestring            >= 0.10.8.1 && < 0.13
-    , containers            >= 0.5.7.1  && < 0.7
+    , containers            >= 0.5.7.1  && < 0.8
     , deepseq               >= 1.4.2.0  && < 1.6
     , mtl                   ^>= 2.2.2   || ^>= 2.3.1
     , text                  >= 1.2.3.0  && < 2.2

diff --git a/servant-quickcheck/servant-quickcheck.cabal b/servant-quickcheck/servant-quickcheck.cabal
@@ -12,7 +12,7 @@ maintainer:         [email protected]
 category:           Web
 build-type:         Simple
 extra-source-files: CHANGELOG.yaml
-tested-with:        GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1
+tested-with:        GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1 || ==9.10.1
 
 source-repository head
   type:     git
@@ -36,7 +36,7 @@ library
   ghc-options:        -Wall -Wcompat
   build-depends:
       aeson                  >=0.8    && <2.3
-    , base                   >=4.9    && <4.20
+    , base                   >=4.9    && <4.21
     , base-compat-batteries  >=0.10.1 && <0.15
     , bytestring             >=0.10   && <0.13
     , case-insensitive       >=1.2    && <1.3

diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
@@ -27,7 +27,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
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 
 extra-source-files:
   CHANGELOG.md
@@ -116,11 +116,11 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-    , base          >=4.9      && <4.20
+    , base          >=4.9      && <4.21
     , bytestring    >=0.10.8.1 && <0.13
     , constraints   >=0.2      && <0.15
-    , containers    >=0.5.7.1  && <0.7
-    , filepath      >=1.4.1.1  && <1.5
+    , containers    >=0.5.7.1  && <0.8
+    , filepath      >=1.4.1.1  && <1.6
     , mtl           ^>=2.2.2   || ^>=2.3.1
     , text          >=1.2.3.0  && <2.2
     , transformers  >=0.5.2.0  && <0.7

diff --git a/servant/servant.cabal b/servant/servant.cabal
@@ -21,7 +21,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
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
 
 extra-source-files: CHANGELOG.md
 
@@ -127,10 +127,10 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-    , base          >=4.9      && <4.20
+    , base          >=4.9      && <4.21
     , bytestring    >=0.10.8.1 && <0.13
     , constraints   >=0.2
-    , containers    >=0.6      && <0.7
+    , containers    >=0.6      && <0.8
     , mtl           ^>=2.2.2   || ^>=2.3.1
     , sop-core      >=0.4.0.0  && <0.6
     , text          >=1.2.3.0  && <2.2

diff --git a/servant/src/Servant/API/TypeLevel.hs b/servant/src/Servant/API/TypeLevel.hs
@@ -271,7 +271,6 @@ families are not evaluated (see https://ghc.haskell.org/trac/ghc/ticket/12048).
 -- ...
 -- ...Only one Fragment allowed per endpoint in api...
 -- ...
--- ...In the instance declaration for...
 class FragmentUnique api => AtMostOneFragment api
 
 instance AtMostOneFragment (Verb m s ct typ)