From 17e3eb10418585a393035236449a12c4019f705a Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Thu, 24 Feb 2022 21:24:59 -0600 Subject: [PATCH] Allow GHC 9.2 for compatible packages --- .github/workflows/master.yml | 1 + cabal.project | 3 +++ doc/cookbook/curl-mock/curl-mock.cabal | 2 ++ .../hoist-server-with-context.cabal | 2 ++ doc/cookbook/https/https.cabal | 2 ++ doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal | 2 ++ doc/tutorial/tutorial.cabal | 2 +- .../servant-auth-client/servant-auth-client.cabal | 4 ++++ servant-auth/servant-auth-docs/servant-auth-docs.cabal | 6 ++++++ .../servant-auth-server/servant-auth-server.cabal | 6 ++++++ servant-auth/servant-auth/servant-auth.cabal | 2 ++ servant-client-core/servant-client-core.cabal | 6 +++--- servant-client/servant-client.cabal | 6 +++--- servant-docs/servant-docs.cabal | 4 ++-- servant-foreign/servant-foreign.cabal | 4 ++-- servant-http-streams/servant-http-streams.cabal | 8 ++++---- servant-server/servant-server.cabal | 4 ++-- servant-swagger/servant-swagger.cabal | 6 +++--- servant/servant.cabal | 4 ++-- 19 files changed, 52 insertions(+), 22 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 329ff302..09fc67f6 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,6 +19,7 @@ jobs: - "8.8.4" - "8.10.7" - "9.0.2" + - "9.2.2" steps: - uses: actions/checkout@v2 diff --git a/cabal.project b/cabal.project index cbef1e41..ebf96a21 100644 --- a/cabal.project +++ b/cabal.project @@ -55,3 +55,6 @@ optimization: False -- https://github.com/chordify/haskell-servant-pagination/pull/12 allow-newer: servant-pagination-2.2.2:servant allow-newer: servant-pagination-2.2.2:servant-server + +allow-newer: servant-multipart:bytestring +allow-newer: servant-multipart-api:bytestring diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal index fc2ea1fb..b794fe81 100644 --- a/doc/cookbook/curl-mock/curl-mock.cabal +++ b/doc/cookbook/curl-mock/curl-mock.cabal @@ -11,6 +11,8 @@ 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) + buildable: False main-is: CurlMock.lhs build-depends: base == 4.* , aeson 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 index 2172fc6c..7f378f04 100644 --- a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal +++ b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal @@ -14,6 +14,8 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-hoist-server-with-context + if impl(ghc >= 9.2) + buildable: False main-is: HoistServerWithContext.lhs build-depends: base == 4.* , base-compat diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index 473c8a6a..bebaea86 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -11,6 +11,8 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-https + if impl(ghc >= 9.2) + buildable: False main-is: Https.lhs build-depends: base == 4.* , servant 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 index 297a1306..819b649e 100644 --- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal +++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal @@ -14,6 +14,8 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-jwt-and-basic-auth + if impl(ghc >= 9.2) + buildable: False main-is: JWTAndBasicAuth.lhs build-depends: base == 4.* , text >= 1.2 diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index 4d4d9d7d..de2d8127 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -64,7 +64,7 @@ library , blaze-markup >= 0.8.0.0 && < 0.9 , cookie >= 0.4.3 && < 0.5 , js-jquery >= 3.3.1 && < 3.4 - , lucid >= 2.9.11 && < 2.10 + , lucid >= 2.9.11 && < 2.12 , random >= 1.1 && < 1.3 , servant-js >= 0.9 && < 0.10 , time >= 1.6.0.1 && < 1.13 diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal index b95366c0..fe74ef01 100644 --- a/servant-auth/servant-auth-client/servant-auth-client.cabal +++ b/servant-auth/servant-auth-client/servant-auth-client.cabal @@ -26,6 +26,8 @@ source-repository head location: https://github.com/haskell-servant/servant library + if impl(ghc >= 9.2) + buildable: False hs-source-dirs: src default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators @@ -44,6 +46,8 @@ library default-language: Haskell2010 test-suite spec + if impl(ghc >= 9.2) + buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal index a80defd1..f87623e1 100644 --- a/servant-auth/servant-auth-docs/servant-auth-docs.cabal +++ b/servant-auth/servant-auth-docs/servant-auth-docs.cabal @@ -30,6 +30,8 @@ source-repository head location: https://github.com/haskell-servant/servant library + if impl(ghc >= 9.2) + buildable: False hs-source-dirs: src default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators @@ -45,6 +47,8 @@ library default-language: Haskell2010 test-suite doctests + if impl(ghc >= 9.2) + buildable: False type: exitcode-stdio-1.0 main-is: doctests.hs build-depends: @@ -58,6 +62,8 @@ test-suite doctests default-language: Haskell2010 test-suite spec + if impl(ghc >= 9.2) + buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal index b9d52c75..dd4aab86 100644 --- a/servant-auth/servant-auth-server/servant-auth-server.cabal +++ b/servant-auth/servant-auth-server/servant-auth-server.cabal @@ -26,6 +26,8 @@ source-repository head location: https://github.com/haskell-servant/servant library + if impl(ghc >= 9.2) + buildable: False hs-source-dirs: src default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators @@ -78,6 +80,8 @@ library default-language: Haskell2010 test-suite readme + if impl(ghc >= 9.2) + buildable: False type: exitcode-stdio-1.0 main-is: README.lhs default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators @@ -96,6 +100,8 @@ test-suite readme buildable: False test-suite spec + if impl(ghc >= 9.2) + buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal index 5c9a1517..5c948b87 100644 --- a/servant-auth/servant-auth/servant-auth.cabal +++ b/servant-auth/servant-auth/servant-auth.cabal @@ -28,6 +28,8 @@ source-repository head location: https://github.com/haskell-servant/servant library + if impl(ghc >= 9.2) + buildable: False hs-source-dirs: src default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index b2965ea1..03cf00b5 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -50,14 +50,14 @@ library -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends: - base >= 4.9 && < 4.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , constraints >= 0.2 && < 0.14 , containers >= 0.5.7.1 && < 0.7 , deepseq >= 1.4.2.0 && < 1.5 , text >= 1.2.3.0 && < 2.1 , transformers >= 0.5.2.0 && < 0.6 - , template-haskell >= 2.11.1.0 && < 2.18 + , template-haskell >= 2.11.1.0 && < 2.19 if !impl(ghc >= 8.2) build-depends: @@ -71,7 +71,7 @@ library -- Here can be exceptions if we really need features from the newer versions. build-depends: aeson >= 1.4.1.0 && < 3 - , base-compat >= 0.10.5 && < 0.12 + , base-compat >= 0.10.5 && < 0.13 , base64-bytestring >= 1.0.0.1 && < 1.3 , exceptions >= 0.10.0 && < 0.11 , free >= 5.1 && < 5.2 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index c1056ff6..689834bf 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -41,14 +41,14 @@ 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.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , containers >= 0.5.7.1 && < 0.7 , deepseq >= 1.4.2.0 && < 1.5 , mtl >= 2.2.2 && < 2.3 , stm >= 2.4.5.1 && < 2.6 , text >= 1.2.3.0 && < 2.1 - , time >= 1.6.0.1 && < 1.10 + , time >= 1.6.0.1 && < 1.12 , transformers >= 0.5.2.0 && < 0.6 if !impl(ghc >= 8.2) @@ -64,7 +64,7 @@ library -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , http-client >= 0.5.13.1 && < 0.8 , http-media >= 0.7.1.3 && < 0.9 , http-types >= 0.12.2 && < 0.13 diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 5d2c4867..84902f7c 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -41,7 +41,7 @@ library -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends: - base >= 4.9 && < 4.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , text >= 1.2.3.0 && < 2.1 @@ -54,7 +54,7 @@ library build-depends: aeson >= 1.4.1.0 && < 3 , aeson-pretty >= 0.8.5 && < 0.9 - , base-compat >= 0.10.5 && < 0.12 + , base-compat >= 0.10.5 && < 0.13 , case-insensitive >= 1.2.0.11 && < 1.3 , hashable >= 1.2.7.0 && < 1.5 , http-media >= 0.7.1.3 && < 0.9 diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 7e139374..b7d747c9 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -41,7 +41,7 @@ library -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends: - base >= 4.9 && < 4.16 + base >= 4.9 && < 4.17 , text >= 1.2.3.0 && < 2.1 -- Servant dependencies @@ -51,7 +51,7 @@ library -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , lens >= 4.17 && < 5.2 , http-types >= 0.12.2 && < 0.13 diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 03384751..2fc80c0f 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -38,13 +38,13 @@ 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.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , containers >= 0.5.7.1 && < 0.7 , deepseq >= 1.4.2.0 && < 1.5 , mtl >= 2.2.2 && < 2.3 , text >= 1.2.3.0 && < 2.1 - , time >= 1.6.0.1 && < 1.10 + , time >= 1.6.0.1 && < 1.12 , transformers >= 0.5.2.0 && < 0.6 if !impl(ghc >= 8.2) @@ -60,13 +60,13 @@ library -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , case-insensitive , http-streams >= 0.8.6.1 && < 0.9 , http-media >= 0.7.1.3 && < 0.9 , io-streams >= 1.5.0.1 && < 1.6 , http-types >= 0.12.2 && < 0.13 - , http-common >= 0.8.2.0 && < 0.8.3 + , http-common >= 0.8.2.0 && < 0.9 , exceptions >= 0.10.0 && < 0.11 , kan-extensions >= 5.2 && < 5.3 , monad-control >= 1.0.2.3 && < 1.1 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 82f19550..533556be 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -60,7 +60,7 @@ 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.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , constraints >= 0.2 && < 0.14 , containers >= 0.5.7.1 && < 0.7 @@ -78,7 +78,7 @@ library -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , base64-bytestring >= 1.0.0.1 && < 1.3 , exceptions >= 0.10.0 && < 0.11 , http-media >= 0.7.1.3 && < 0.9 diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index 24106433..15543e86 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -50,7 +50,7 @@ source-repository head custom-setup setup-depends: base >=4.9 && <5, - Cabal >= 1.24 && < 3.5, + Cabal >= 1.24, cabal-doctest >=1.0.6 && <1.1 library @@ -72,8 +72,8 @@ library build-depends: aeson >=1.4.2.0 && <3 , aeson-pretty >=0.8.7 && <0.9 , base >=4.9.1.0 && <5 - , base-compat >=0.10.5 && <0.12 - , bytestring >=0.10.8.1 && <0.11 + , base-compat >=0.10.5 && <0.13 + , bytestring >=0.10.8.1 && <0.12 , http-media >=0.7.1.3 && <0.9 , insert-ordered-containers >=0.2.1.0 && <0.3 , lens >=4.17 && <6 diff --git a/servant/servant.cabal b/servant/servant.cabal index 7a82a9ee..29836fb8 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -80,7 +80,7 @@ library -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends: - base >= 4.9 && < 4.16 + base >= 4.9 && < 4.17 , bytestring >= 0.10.8.1 && < 0.12 , constraints >= 0.2 , mtl >= 2.2.2 && < 2.3 @@ -98,7 +98,7 @@ library -- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.5 && < 0.12 + base-compat >= 0.10.5 && < 0.13 , aeson >= 1.4.1.0 && < 3 , attoparsec >= 0.13.2.2 && < 0.15 , bifunctors >= 5.5.3 && < 5.6