From ced5f1a65514012406f9963f6312c2967f62828e Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Mon, 21 Mar 2022 15:37:40 +0100 Subject: [PATCH 1/4] Allow hspec-2.9 --- 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/servant-auth-swagger/servant-auth-swagger.cabal | 4 ++-- servant-client-core/servant-client-core.cabal | 4 ++-- servant-client/servant-client.cabal | 4 ++-- servant-foreign/servant-foreign.cabal | 4 ++-- servant-http-streams/servant-http-streams.cabal | 4 ++-- servant-server/servant-server.cabal | 4 ++-- servant-swagger/servant-swagger.cabal | 4 ++-- servant/servant.cabal | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal index 56a7cd94..621bf832 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.9 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 -- 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.9 + hspec >= 2.5.5 && < 2.10 , 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 0c404b5d..d38948dc 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.9 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 -- 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.9 + , hspec >= 2.5.5 && < 2.10 , 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 aad2687e..043ee65c 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.8 + build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10 -- 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.8 + , hspec >= 2.5.5 && < 2.10 , QuickCheck >= 2.11.3 && < 2.15 , http-client >= 0.5.13.1 && < 0.8 , lens-aeson >= 1.0.2 && < 1.2 diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal index 51ab608d..c4eca379 100644 --- a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal +++ b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal @@ -51,7 +51,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.9 + build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.10 -- dependencies with bounds inherited from the library stanza build-depends: base @@ -67,7 +67,7 @@ test-suite spec -- test dependencies build-depends: servant-auth-swagger - , hspec >= 2.5.5 && < 2.9 + , hspec >= 2.5.5 && < 2.10 , 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 03cf00b5..34af6889 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -104,8 +104,8 @@ test-suite spec -- Additional dependencies build-depends: deepseq >= 1.4.2.0 && < 1.5 - , hspec >= 2.6.0 && < 2.9 + , hspec >= 2.6.0 && < 2.10 , QuickCheck >= 2.12.6.1 && < 2.15 build-tool-depends: - hspec-discover:hspec-discover >= 2.6.0 && <2.9 + hspec-discover:hspec-discover >= 2.6.0 && <2.10 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 689834bf..ae628b38 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -124,7 +124,7 @@ test-suite spec -- Additional dependencies build-depends: entropy >= 0.4.1.3 && < 0.5 - , hspec >= 2.6.0 && < 2.9 + , hspec >= 2.6.0 && < 2.10 , 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.9 + hspec-discover:hspec-discover >= 2.6.0 && < 2.10 test-suite readme type: exitcode-stdio-1.0 diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index b7d747c9..5ad34fd3 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.9 + hspec >= 2.6.0 && <2.10 build-tool-depends: - hspec-discover:hspec-discover >=2.6.0 && <2.9 + hspec-discover:hspec-discover >=2.6.0 && <2.10 default-language: Haskell2010 diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 0e66e19e..1282da1f 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -112,7 +112,7 @@ test-suite spec -- Additional dependencies build-depends: entropy >= 0.4.1.3 && < 0.5 - , hspec >= 2.6.0 && < 2.9 + , hspec >= 2.6.0 && < 2.10 , 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.9 + hspec-discover:hspec-discover >= 2.6.0 && < 2.10 test-suite readme type: exitcode-stdio-1.0 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index c5e2f501..2488ae74 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -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.9 + , hspec >= 2.6.0 && < 2.10 , 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.9 + hspec-discover:hspec-discover >= 2.6.0 && <2.10 diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index 15543e86..5b8da0ea 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -106,11 +106,11 @@ test-suite spec type: exitcode-stdio-1.0 hs-source-dirs: test main-is: Spec.hs - build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8 + build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.10 build-depends: base , base-compat , aeson >=1.4.2.0 && <3 - , hspec >=2.6.0 && <2.8 + , hspec >=2.6.0 && <2.10 , QuickCheck , lens , lens-aeson >=1.0.2 && <1.2 diff --git a/servant/servant.cabal b/servant/servant.cabal index 9c617ae4..32b63feb 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -166,9 +166,9 @@ test-suite spec -- Additional dependencies build-depends: - hspec >= 2.6.0 && < 2.9 + hspec >= 2.6.0 && < 2.10 , 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.9 + hspec-discover:hspec-discover >= 2.6.0 && < 2.10 From 256cec566f603c6c66947fa91026d5e0e0a9068a Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 22 Mar 2022 22:42:48 +0100 Subject: [PATCH 2/4] Support hspec >= 2.9 in servant-swagger tests --- servant-swagger/src/Servant/Swagger.hs | 6 +++--- servant-swagger/src/Servant/Swagger/Internal/Test.hs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/servant-swagger/src/Servant/Swagger.hs b/servant-swagger/src/Servant/Swagger.hs index c45b0fbc..0ceea5bc 100644 --- a/servant-swagger/src/Servant/Swagger.hs +++ b/servant-swagger/src/Servant/Swagger.hs @@ -160,11 +160,11 @@ import Servant.Swagger.Internal.Orphans () -- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary -- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI) -- --- [User] +-- [User]... -- ... --- User +-- User... -- ... --- UserId +-- UserId... -- ... -- Finished in ... seconds -- 3 examples, 0 failures diff --git a/servant-swagger/src/Servant/Swagger/Internal/Test.hs b/servant-swagger/src/Servant/Swagger/Internal/Test.hs index 0fecb0a1..e1e32766 100644 --- a/servant-swagger/src/Servant/Swagger/Internal/Test.hs +++ b/servant-swagger/src/Servant/Swagger/Internal/Test.hs @@ -53,10 +53,10 @@ import Servant.Swagger.Internal.TypeLevel -- -- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI) -- --- ToJSON matches ToSchema --- User +-- ToJSON matches ToSchema... +-- User... -- ... --- UserId +-- UserId... -- ... -- Finished in ... seconds -- 2 examples, 0 failures @@ -118,11 +118,11 @@ validateEveryToJSONWithPatternChecker checker _ = props -- :} -- -- read . show == id --- Bool +-- Bool... -- ... --- Int +-- Int... -- ... --- [Char] +-- [Char]... -- ... -- Finished in ... seconds -- 3 examples, 0 failures From 04f59c012b3c18f3b101f43a399c5c1b2f1dd11a Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 22 Mar 2022 23:10:05 +0100 Subject: [PATCH 3/4] Require servant-0.18.2 in servant-swagger This version of servant adds Fragment, which servant-swagger adds instance for. --- servant-swagger/servant-swagger.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index 5b8da0ea..ed539960 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -77,7 +77,7 @@ library , http-media >=0.7.1.3 && <0.9 , insert-ordered-containers >=0.2.1.0 && <0.3 , lens >=4.17 && <6 - , servant >=0.18.1 && <0.20 + , servant >=0.18.2 && <0.20 , singleton-bool >=0.1.4 && <0.2 , swagger2 >=2.3.0.1 && <3 , text >=1.2.3.0 && <2.1 From dd29f25f773ab3f33b527e571d4cd8935a72ebcf Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 22 Mar 2022 23:22:02 +0100 Subject: [PATCH 4/4] Allow lens-aeson 1.2 --- servant-auth/servant-auth-server/servant-auth-server.cabal | 2 +- servant-swagger/servant-swagger.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal index 043ee65c..d750db4f 100644 --- a/servant-auth/servant-auth-server/servant-auth-server.cabal +++ b/servant-auth/servant-auth-server/servant-auth-server.cabal @@ -126,7 +126,7 @@ test-suite spec , hspec >= 2.5.5 && < 2.10 , QuickCheck >= 2.11.3 && < 2.15 , http-client >= 0.5.13.1 && < 0.8 - , lens-aeson >= 1.0.2 && < 1.2 + , lens-aeson >= 1.0.2 && < 1.3 , warp >= 3.2.25 && < 3.4 , wreq >= 0.5.2.1 && < 0.6 other-modules: diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index ed539960..9aeab015 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -113,7 +113,7 @@ test-suite spec , hspec >=2.6.0 && <2.10 , QuickCheck , lens - , lens-aeson >=1.0.2 && <1.2 + , lens-aeson >=1.0.2 && <1.3 , servant , servant-swagger , swagger2