eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1568 from haskell-servant/maksbotan/stackage-deps

Browse source 
Allow hspec-2.9, lens-aeson-1.2
This commit is contained in:
Maxim Koltsov 2022-03-22 23:43:22 +01:00 committed by GitHub
commit f5a91d20e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servant-auth/servant-auth-client/servant-auth-client.cabal
View file

@ -50,7 +50,7 @@ test-suite spec
test test
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall 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 -- dependencies with bounds inherited from the library stanza
build-depends: build-depends:
@ -62,7 +62,7 @@ test-suite spec
-- test dependencies -- test dependencies
build-depends: build-depends:
hspec >= 2.5.5 && < 2.9 hspec >= 2.5.5 && < 2.10
, QuickCheck >= 2.11.3 && < 2.15 , QuickCheck >= 2.11.3 && < 2.15
, aeson >= 1.3.1.1 && < 3 , aeson >= 1.3.1.1 && < 3
, bytestring >= 0.10.6.0 && < 0.12 , bytestring >= 0.10.6.0 && < 0.12

4
servant-auth/servant-auth-docs/servant-auth-docs.cabal
View file

@ -64,7 +64,7 @@ test-suite spec
test test
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall 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 -- dependencies with bounds inherited from the library stanza
build-depends: build-depends:
@ -78,7 +78,7 @@ test-suite spec
-- test dependencies -- test dependencies
build-depends: build-depends:
servant-auth-docs servant-auth-docs
, hspec >= 2.5.5 && < 2.9 , hspec >= 2.5.5 && < 2.10
, QuickCheck >= 2.11.3 && < 2.15 , QuickCheck >= 2.11.3 && < 2.15
default-language: Haskell2010 default-language: Haskell2010

6
servant-auth/servant-auth-server/servant-auth-server.cabal
View file

@ -102,7 +102,7 @@ test-suite spec
test test
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall 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 -- dependencies with bounds inherited from the library stanza
build-depends: build-depends:
@ -123,10 +123,10 @@ test-suite spec
-- test dependencies -- test dependencies
build-depends: build-depends:
servant-auth-server servant-auth-server
, hspec >= 2.5.5 && < 2.8 , hspec >= 2.5.5 && < 2.10
, QuickCheck >= 2.11.3 && < 2.15 , QuickCheck >= 2.11.3 && < 2.15
, http-client >= 0.5.13.1 && < 0.8 , 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 , warp >= 3.2.25 && < 3.4
, wreq >= 0.5.2.1 && < 0.6 , wreq >= 0.5.2.1 && < 0.6
other-modules: other-modules:

4
servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
View file

@ -51,7 +51,7 @@ test-suite spec
test test
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall 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 -- dependencies with bounds inherited from the library stanza
build-depends: build-depends:
base base
@ -67,7 +67,7 @@ test-suite spec
-- test dependencies -- test dependencies
build-depends: build-depends:
servant-auth-swagger servant-auth-swagger
, hspec >= 2.5.5 && < 2.9 , hspec >= 2.5.5 && < 2.10
, QuickCheck >= 2.11.3 && < 2.15 , QuickCheck >= 2.11.3 && < 2.15
other-modules: other-modules:
Servant.Auth.SwaggerSpec Servant.Auth.SwaggerSpec

4
servant-client-core/servant-client-core.cabal
View file

@ -104,8 +104,8 @@ test-suite spec
-- Additional dependencies -- Additional dependencies
build-depends: build-depends:
deepseq >= 1.4.2.0 && < 1.5 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 , QuickCheck >= 2.12.6.1 && < 2.15
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && <2.9 hspec-discover:hspec-discover >= 2.6.0 && <2.10

4
servant-client/servant-client.cabal
View file

@ -124,7 +124,7 @@ test-suite spec
-- Additional dependencies -- Additional dependencies
build-depends: build-depends:
entropy >= 0.4.1.3 && < 0.5 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 , HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2 , network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.15 , QuickCheck >= 2.12.6.1 && < 2.15
@ -133,7 +133,7 @@ test-suite spec
, tdigest >= 0.2 && < 0.3 , tdigest >= 0.2 && < 0.3
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && < 2.9 hspec-discover:hspec-discover >= 2.6.0 && < 2.10
test-suite readme test-suite readme
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0

4
servant-foreign/servant-foreign.cabal
View file

@ -74,7 +74,7 @@ test-suite spec
-- Additional dependencies -- Additional dependencies
build-depends: build-depends:
hspec >= 2.6.0 && <2.9 hspec >= 2.6.0 && <2.10
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >=2.6.0 && <2.9 hspec-discover:hspec-discover >=2.6.0 && <2.10
default-language: Haskell2010 default-language: Haskell2010

4
servant-http-streams/servant-http-streams.cabal
View file

@ -112,7 +112,7 @@ test-suite spec
-- Additional dependencies -- Additional dependencies
build-depends: build-depends:
entropy >= 0.4.1.3 && < 0.5 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 , HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2 , network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.15 , QuickCheck >= 2.12.6.1 && < 2.15
@ -121,7 +121,7 @@ test-suite spec
, tdigest >= 0.2 && < 0.3 , tdigest >= 0.2 && < 0.3
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && < 2.9 hspec-discover:hspec-discover >= 2.6.0 && < 2.10
test-suite readme test-suite readme
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0

4
servant-server/servant-server.cabal
View file

@ -159,7 +159,7 @@ test-suite spec
build-depends: build-depends:
aeson >= 1.4.1.0 && < 3 aeson >= 1.4.1.0 && < 3
, directory >= 1.3.0.0 && < 1.4 , 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 , hspec-wai >= 0.10.1 && < 0.12
, QuickCheck >= 2.12.6.1 && < 2.15 , QuickCheck >= 2.12.6.1 && < 2.15
, should-not-typecheck >= 2.1.0 && < 2.2 , should-not-typecheck >= 2.1.0 && < 2.2
@ -167,4 +167,4 @@ test-suite spec
, wai-extra >= 3.0.24.3 && < 3.2 , wai-extra >= 3.0.24.3 && < 3.2
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && <2.9 hspec-discover:hspec-discover >= 2.6.0 && <2.10

8
servant-swagger/servant-swagger.cabal
View file

@ -77,7 +77,7 @@ library
, http-media >=0.7.1.3 && <0.9 , http-media >=0.7.1.3 && <0.9
, insert-ordered-containers >=0.2.1.0 && <0.3 , insert-ordered-containers >=0.2.1.0 && <0.3
, lens >=4.17 && <6 , lens >=4.17 && <6
, servant >=0.18.1 && <0.20 , servant >=0.18.2 && <0.20
, singleton-bool >=0.1.4 && <0.2 , singleton-bool >=0.1.4 && <0.2
, swagger2 >=2.3.0.1 && <3 , swagger2 >=2.3.0.1 && <3
, text >=1.2.3.0 && <2.1 , text >=1.2.3.0 && <2.1
@ -106,14 +106,14 @@ test-suite spec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
hs-source-dirs: test hs-source-dirs: test
main-is: Spec.hs 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 build-depends: base
, base-compat , base-compat
, aeson >=1.4.2.0 && <3 , aeson >=1.4.2.0 && <3
, hspec >=2.6.0 && <2.8 , hspec >=2.6.0 && <2.10
, QuickCheck , QuickCheck
, lens , lens
, lens-aeson >=1.0.2 && <1.2 , lens-aeson >=1.0.2 && <1.3
, servant , servant
, servant-swagger , servant-swagger
, swagger2 , swagger2

6
servant-swagger/src/Servant/Swagger.hs
View file

@ -160,11 +160,11 @@ import Servant.Swagger.Internal.Orphans ()
-- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary -- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary
-- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI) -- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI)
-- <BLANKLINE> -- <BLANKLINE>
-- [User] -- [User]...
-- ... -- ...
-- User -- User...
-- ... -- ...
-- UserId -- UserId...
-- ... -- ...
-- Finished in ... seconds -- Finished in ... seconds
-- 3 examples, 0 failures -- 3 examples, 0 failures

12
servant-swagger/src/Servant/Swagger/Internal/Test.hs
View file

@ -53,10 +53,10 @@ import Servant.Swagger.Internal.TypeLevel
-- --
-- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI) -- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI)
-- <BLANKLINE> -- <BLANKLINE>
-- ToJSON matches ToSchema -- ToJSON matches ToSchema...
-- User -- User...
-- ... -- ...
-- UserId -- UserId...
-- ... -- ...
-- Finished in ... seconds -- Finished in ... seconds
-- 2 examples, 0 failures -- 2 examples, 0 failures
@ -118,11 +118,11 @@ validateEveryToJSONWithPatternChecker checker _ = props
-- :} -- :}
-- <BLANKLINE> -- <BLANKLINE>
-- read . show == id -- read . show == id
-- Bool -- Bool...
-- ... -- ...
-- Int -- Int...
-- ... -- ...
-- [Char] -- [Char]...
-- ... -- ...
-- Finished in ... seconds -- Finished in ... seconds
-- 3 examples, 0 failures -- 3 examples, 0 failures

4
servant/servant.cabal
View file

@ -166,9 +166,9 @@ test-suite spec
-- Additional dependencies -- Additional dependencies
build-depends: build-depends:
hspec >= 2.6.0 && < 2.9 hspec >= 2.6.0 && < 2.10
, QuickCheck >= 2.12.6.1 && < 2.15 , QuickCheck >= 2.12.6.1 && < 2.15
, quickcheck-instances >= 0.3.19 && < 0.4 , quickcheck-instances >= 0.3.19 && < 0.4
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && < 2.9 hspec-discover:hspec-discover >= 2.6.0 && < 2.10