From 77f4e686d44cdcfd5c54700e25f0ef18fcc14094 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 18 Nov 2022 11:50:00 -0800 Subject: [PATCH] tree-wide: bump hspec bound to < 2.11 This is required to work on the GHC 9.4.3 Nix package set. --- servant-auth/servant-auth-client/servant-auth-client.cabal | 4 ++-- servant-auth/servant-auth-docs/servant-auth-docs.cabal | 4 ++-- servant-auth/servant-auth-server/servant-auth-server.cabal | 4 ++-- .../servant-auth-swagger/servant-auth-swagger.cabal | 4 ++-- servant-client-core/servant-client-core.cabal | 6 +++--- servant-client/servant-client.cabal | 6 +++--- servant-conduit/servant-conduit.cabal | 2 +- servant-docs/servant-docs.cabal | 2 +- servant-foreign/servant-foreign.cabal | 4 ++-- servant-http-streams/servant-http-streams.cabal | 6 +++--- servant-machines/servant-machines.cabal | 2 +- servant-pipes/servant-pipes.cabal | 2 +- servant-server/servant-server.cabal | 6 +++--- servant-swagger/servant-swagger.cabal | 4 ++-- servant/servant.cabal | 6 +++--- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal index c1ebfc08..38563cbe 100644 --- a/servant-auth/servant-auth-client/servant-auth-client.cabal +++ b/servant-auth/servant-auth-client/servant-auth-client.cabal @@ -50,7 +50,7 @@ test-suite spec test default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators ghc-options: -Wall - build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11 -- dependencies with bounds inherited from the library stanza build-depends: @@ -62,7 +62,7 @@ test-suite spec -- test dependencies build-depends: - hspec >= 2.5.5 && < 2.10 + hspec >= 2.5.5 && < 2.11 , QuickCheck >= 2.11.3 && < 2.15 , aeson >= 1.3.1.1 && < 3 , bytestring >= 0.10.6.0 && < 0.12 diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal index f2bdeb8b..39b7ba09 100644 --- a/servant-auth/servant-auth-docs/servant-auth-docs.cabal +++ b/servant-auth/servant-auth-docs/servant-auth-docs.cabal @@ -64,7 +64,7 @@ test-suite spec test default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators ghc-options: -Wall - build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11 -- dependencies with bounds inherited from the library stanza build-depends: @@ -78,7 +78,7 @@ test-suite spec -- test dependencies build-depends: servant-auth-docs - , hspec >= 2.5.5 && < 2.10 + , hspec >= 2.5.5 && < 2.11 , QuickCheck >= 2.11.3 && < 2.15 default-language: Haskell2010 diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal index b3fc096e..0f958ebc 100644 --- a/servant-auth/servant-auth-server/servant-auth-server.cabal +++ b/servant-auth/servant-auth-server/servant-auth-server.cabal @@ -102,7 +102,7 @@ test-suite spec test default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators ghc-options: -Wall - build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11 -- dependencies with bounds inherited from the library stanza build-depends: @@ -123,7 +123,7 @@ test-suite spec -- test dependencies build-depends: servant-auth-server - , hspec >= 2.5.5 && < 2.10 + , hspec >= 2.5.5 && < 2.11 , QuickCheck >= 2.11.3 && < 2.15 , http-client >= 0.5.13.1 && < 0.8 , lens-aeson >= 1.0.2 && < 1.3 diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal index f02f3c77..a6a20429 100644 --- a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal +++ b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal @@ -49,7 +49,7 @@ test-suite spec test default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators ghc-options: -Wall - build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.10 + build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.11 -- dependencies with bounds inherited from the library stanza build-depends: base @@ -63,7 +63,7 @@ test-suite spec -- test dependencies build-depends: servant-auth-swagger - , hspec >= 2.5.5 && < 2.10 + , hspec >= 2.5.5 && < 2.11 , QuickCheck >= 2.11.3 && < 2.15 other-modules: Servant.Auth.SwaggerSpec diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 1d15594f..7f5f5b68 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -16,7 +16,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 , GHCJS ==8.6.0.1 extra-source-files: @@ -104,8 +104,8 @@ test-suite spec -- Additional dependencies build-depends: deepseq >= 1.4.2.0 && < 1.5 - , hspec >= 2.6.0 && < 2.10 + , hspec >= 2.6.0 && < 2.11 , QuickCheck >= 2.12.6.1 && < 2.15 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && <2.10 + hspec-discover:hspec-discover >= 2.6.0 && <2.11 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2669f6d4..b942d898 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -20,7 +20,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 , GHCJS ==8.6.0.1 extra-source-files: @@ -124,7 +124,7 @@ test-suite spec -- Additional dependencies build-depends: entropy >= 0.4.1.3 && < 0.5 - , hspec >= 2.6.0 && < 2.10 + , hspec >= 2.6.0 && < 2.11 , HUnit >= 1.6.0.0 && < 1.7 , network >= 2.8.0.0 && < 3.2 , QuickCheck >= 2.12.6.1 && < 2.15 @@ -133,7 +133,7 @@ test-suite spec , tdigest >= 0.2 && < 0.3 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && < 2.10 + hspec-discover:hspec-discover >= 2.6.0 && < 2.11 test-suite readme type: exitcode-stdio-1.0 diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index 2f530206..ddea9d1b 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/servant-conduit/servant-conduit.cabal @@ -16,7 +16,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2018-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.4.2 extra-source-files: CHANGELOG.md diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 59612621..89471781 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -19,7 +19,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 extra-source-files: CHANGELOG.md diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 6cb4ba82..9b86944f 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -74,7 +74,7 @@ test-suite spec -- Additional dependencies build-depends: - hspec >= 2.6.0 && <2.10 + hspec >= 2.6.0 && <2.11 build-tool-depends: - hspec-discover:hspec-discover >=2.6.0 && <2.10 + hspec-discover:hspec-discover >=2.6.0 && <2.11 default-language: Haskell2010 diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 82b1c03a..a46b559c 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -20,7 +20,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 extra-source-files: CHANGELOG.md @@ -112,7 +112,7 @@ test-suite spec -- Additional dependencies build-depends: entropy >= 0.4.1.3 && < 0.5 - , hspec >= 2.6.0 && < 2.10 + , hspec >= 2.6.0 && < 2.11 , HUnit >= 1.6.0.0 && < 1.7 , network >= 2.8.0.0 && < 3.2 , QuickCheck >= 2.12.6.1 && < 2.15 @@ -121,7 +121,7 @@ test-suite spec , tdigest >= 0.2 && < 0.3 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && < 2.10 + hspec-discover:hspec-discover >= 2.6.0 && < 2.11 test-suite readme type: exitcode-stdio-1.0 diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index ecdb6c38..418957a9 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -16,7 +16,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2018-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.4.2 extra-source-files: CHANGELOG.md diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index fbdecdad..671fce3c 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.cabal @@ -16,7 +16,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2018-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.4.2 extra-source-files: CHANGELOG.md diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 15cba22c..829a8392 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -23,7 +23,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 extra-source-files: CHANGELOG.md @@ -159,7 +159,7 @@ test-suite spec build-depends: aeson >= 1.4.1.0 && < 3 , directory >= 1.3.0.0 && < 1.4 - , hspec >= 2.6.0 && < 2.10 + , hspec >= 2.6.0 && < 2.11 , hspec-wai >= 0.10.1 && < 0.12 , QuickCheck >= 2.12.6.1 && < 2.15 , should-not-typecheck >= 2.1.0 && < 2.2 @@ -167,4 +167,4 @@ test-suite spec , wai-extra >= 3.0.24.3 && < 3.2 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && <2.10 + hspec-discover:hspec-discover >= 2.6.0 && <2.11 diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index 0d53bd09..59b89289 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -28,7 +28,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com copyright: (c) 2015-2018, Servant contributors category: Web, Servant, Swagger build-type: Custom -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.4.2 extra-source-files: README.md @@ -92,7 +92,7 @@ test-suite doctests build-depends: base, directory >= 1.0, - doctest >= 0.17 && <0.21, + doctest >= 0.17 && <0.22, servant, QuickCheck, filepath diff --git a/servant/servant.cabal b/servant/servant.cabal index a3dc401d..ee3428b5 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -20,7 +20,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 || ==9.4.2 , GHCJS ==8.6.0.1 extra-source-files: @@ -166,9 +166,9 @@ test-suite spec -- Additional dependencies build-depends: - hspec >= 2.6.0 && < 2.10 + hspec >= 2.6.0 && < 2.11 , QuickCheck >= 2.12.6.1 && < 2.15 , quickcheck-instances >= 0.3.19 && < 0.4 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && < 2.10 + hspec-discover:hspec-discover >= 2.6.0 && < 2.11