git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1568 from haskell-servant/maksbotan/stackage-deps

Allow hspec-2.9, lens-aeson-1.2

commitf5a91d20e1bd56958878d50fd3d6bdff69e9ad2a authorMaxim Koltsov <kolmax94@gmail.com> dateTue 22 Mar 2022, 23:43 (5 years ago) parent276ca2edd29f25
13 files changed+34−34
compare with master
unifiedsplit
servant-auth/servant-auth-client/servant-auth-client.cabal+2−2 servant-auth/servant-auth-docs/servant-auth-docs.cabal+2−2 servant-auth/servant-auth-server/servant-auth-server.cabal+3−3 servant-auth/servant-auth-swagger/servant-auth-swagger.cabal+2−2 servant-client-core/servant-client-core.cabal+2−2 servant-client/servant-client.cabal+2−2 servant-foreign/servant-foreign.cabal+2−2 servant-http-streams/servant-http-streams.cabal+2−2 servant-server/servant-server.cabal+2−2 servant-swagger/servant-swagger.cabal+4−4 servant-swagger/src/Servant/Swagger.hs+3−3 servant-swagger/src/Servant/Swagger/Internal/Test.hs+6−6 servant/servant.cabal+2−2
servant-auth/servant-auth-client/servant-auth-client.cabal+2−2
@@ -50,7 +50,7 @@ test-suite spec
5050 test
5151 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
5252 ghc-options: -Wall
53− build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.9
53+ build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
5454
5555 -- dependencies with bounds inherited from the library stanza
5656 build-depends:
@@ -62,7 +62,7 @@ test-suite spec
6262
6363 -- test dependencies
6464 build-depends:
65− hspec >= 2.5.5 && < 2.9
65+ hspec >= 2.5.5 && < 2.10
6666 , QuickCheck >= 2.11.3 && < 2.15
6767 , aeson >= 1.3.1.1 && < 3
6868 , bytestring >= 0.10.6.0 && < 0.12
servant-auth/servant-auth-docs/servant-auth-docs.cabal+2−2
@@ -64,7 +64,7 @@ test-suite spec
6464 test
6565 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
6666 ghc-options: -Wall
67− build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.9
67+ build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
6868
6969 -- dependencies with bounds inherited from the library stanza
7070 build-depends:
@@ -78,7 +78,7 @@ test-suite spec
7878 -- test dependencies
7979 build-depends:
8080 servant-auth-docs
81− , hspec >= 2.5.5 && < 2.9
81+ , hspec >= 2.5.5 && < 2.10
8282 , QuickCheck >= 2.11.3 && < 2.15
8383
8484 default-language: Haskell2010
servant-auth/servant-auth-server/servant-auth-server.cabal+3−3
@@ -102,7 +102,7 @@ test-suite spec
102102 test
103103 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
104104 ghc-options: -Wall
105− build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.8
105+ build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
106106
107107 -- dependencies with bounds inherited from the library stanza
108108 build-depends:
@@ -123,10 +123,10 @@ test-suite spec
123123 -- test dependencies
124124 build-depends:
125125 servant-auth-server
126− , hspec >= 2.5.5 && < 2.8
126+ , hspec >= 2.5.5 && < 2.10
127127 , QuickCheck >= 2.11.3 && < 2.15
128128 , http-client >= 0.5.13.1 && < 0.8
129− , lens-aeson >= 1.0.2 && < 1.2
129+ , lens-aeson >= 1.0.2 && < 1.3
130130 , warp >= 3.2.25 && < 3.4
131131 , wreq >= 0.5.2.1 && < 0.6
132132 other-modules:
servant-auth/servant-auth-swagger/servant-auth-swagger.cabal+2−2
@@ -51,7 +51,7 @@ test-suite spec
5151 test
5252 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
5353 ghc-options: -Wall
54− build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.9
54+ build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.10
5555 -- dependencies with bounds inherited from the library stanza
5656 build-depends:
5757 base
@@ -67,7 +67,7 @@ test-suite spec
6767 -- test dependencies
6868 build-depends:
6969 servant-auth-swagger
70− , hspec >= 2.5.5 && < 2.9
70+ , hspec >= 2.5.5 && < 2.10
7171 , QuickCheck >= 2.11.3 && < 2.15
7272 other-modules:
7373 Servant.Auth.SwaggerSpec
servant-client-core/servant-client-core.cabal+2−2
@@ -104,8 +104,8 @@ test-suite spec
104104 -- Additional dependencies
105105 build-depends:
106106 deepseq >= 1.4.2.0 && < 1.5
107− , hspec >= 2.6.0 && < 2.9
107+ , hspec >= 2.6.0 && < 2.10
108108 , QuickCheck >= 2.12.6.1 && < 2.15
109109
110110 build-tool-depends:
111− hspec-discover:hspec-discover >= 2.6.0 && <2.9
111+ hspec-discover:hspec-discover >= 2.6.0 && <2.10
servant-client/servant-client.cabal+2−2
@@ -124,7 +124,7 @@ test-suite spec
124124 -- Additional dependencies
125125 build-depends:
126126 entropy >= 0.4.1.3 && < 0.5
127− , hspec >= 2.6.0 && < 2.9
127+ , hspec >= 2.6.0 && < 2.10
128128 , HUnit >= 1.6.0.0 && < 1.7
129129 , network >= 2.8.0.0 && < 3.2
130130 , QuickCheck >= 2.12.6.1 && < 2.15
@@ -133,7 +133,7 @@ test-suite spec
133133 , tdigest >= 0.2 && < 0.3
134134
135135 build-tool-depends:
136− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
136+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10
137137
138138test-suite readme
139139 type: exitcode-stdio-1.0
servant-foreign/servant-foreign.cabal+2−2
@@ -74,7 +74,7 @@ test-suite spec
7474
7575 -- Additional dependencies
7676 build-depends:
77− hspec >= 2.6.0 && <2.9
77+ hspec >= 2.6.0 && <2.10
7878 build-tool-depends:
79− hspec-discover:hspec-discover >=2.6.0 && <2.9
79+ hspec-discover:hspec-discover >=2.6.0 && <2.10
8080 default-language: Haskell2010
servant-http-streams/servant-http-streams.cabal+2−2
@@ -112,7 +112,7 @@ test-suite spec
112112 -- Additional dependencies
113113 build-depends:
114114 entropy >= 0.4.1.3 && < 0.5
115− , hspec >= 2.6.0 && < 2.9
115+ , hspec >= 2.6.0 && < 2.10
116116 , HUnit >= 1.6.0.0 && < 1.7
117117 , network >= 2.8.0.0 && < 3.2
118118 , QuickCheck >= 2.12.6.1 && < 2.15
@@ -121,7 +121,7 @@ test-suite spec
121121 , tdigest >= 0.2 && < 0.3
122122
123123 build-tool-depends:
124− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
124+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10
125125
126126test-suite readme
127127 type: exitcode-stdio-1.0
servant-server/servant-server.cabal+2−2
@@ -159,7 +159,7 @@ test-suite spec
159159 build-depends:
160160 aeson >= 1.4.1.0 && < 3
161161 , directory >= 1.3.0.0 && < 1.4
162− , hspec >= 2.6.0 && < 2.9
162+ , hspec >= 2.6.0 && < 2.10
163163 , hspec-wai >= 0.10.1 && < 0.12
164164 , QuickCheck >= 2.12.6.1 && < 2.15
165165 , should-not-typecheck >= 2.1.0 && < 2.2
@@ -167,4 +167,4 @@ test-suite spec
167167 , wai-extra >= 3.0.24.3 && < 3.2
168168
169169 build-tool-depends:
170− hspec-discover:hspec-discover >= 2.6.0 && <2.9
170+ hspec-discover:hspec-discover >= 2.6.0 && <2.10
servant-swagger/servant-swagger.cabal+4−4
@@ -77,7 +77,7 @@ library
7777 , http-media >=0.7.1.3 && <0.9
7878 , insert-ordered-containers >=0.2.1.0 && <0.3
7979 , lens >=4.17 && <6
80− , servant >=0.18.1 && <0.20
80+ , servant >=0.18.2 && <0.20
8181 , singleton-bool >=0.1.4 && <0.2
8282 , swagger2 >=2.3.0.1 && <3
8383 , text >=1.2.3.0 && <2.1
@@ -106,14 +106,14 @@ test-suite spec
106106 type: exitcode-stdio-1.0
107107 hs-source-dirs: test
108108 main-is: Spec.hs
109− build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8
109+ build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.10
110110 build-depends: base
111111 , base-compat
112112 , aeson >=1.4.2.0 && <3
113− , hspec >=2.6.0 && <2.8
113+ , hspec >=2.6.0 && <2.10
114114 , QuickCheck
115115 , lens
116− , lens-aeson >=1.0.2 && <1.2
116+ , lens-aeson >=1.0.2 && <1.3
117117 , servant
118118 , servant-swagger
119119 , swagger2
servant-swagger/src/Servant/Swagger.hs+3−3
@@ -160,11 +160,11 @@ import Servant.Swagger.Internal.Orphans ()
160160-- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary
161161-- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI)
162162-- <BLANKLINE>
163−-- [User]
163+-- [User]...
164164-- ...
165−-- User
165+-- User...
166166-- ...
167−-- UserId
167+-- UserId...
168168-- ...
169169-- Finished in ... seconds
170170-- 3 examples, 0 failures
servant-swagger/src/Servant/Swagger/Internal/Test.hs+6−6
@@ -53,10 +53,10 @@ import Servant.Swagger.Internal.TypeLevel
5353--
5454-- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI)
5555-- <BLANKLINE>
56−-- ToJSON matches ToSchema
57−-- User
56+-- ToJSON matches ToSchema...
57+-- User...
5858-- ...
59−-- UserId
59+-- UserId...
6060-- ...
6161-- Finished in ... seconds
6262-- 2 examples, 0 failures
@@ -118,11 +118,11 @@ validateEveryToJSONWithPatternChecker checker _ = props
118118-- :}
119119-- <BLANKLINE>
120120-- read . show == id
121−-- Bool
121+-- Bool...
122122-- ...
123−-- Int
123+-- Int...
124124-- ...
125−-- [Char]
125+-- [Char]...
126126-- ...
127127-- Finished in ... seconds
128128-- 3 examples, 0 failures
servant/servant.cabal+2−2
@@ -166,9 +166,9 @@ test-suite spec
166166
167167 -- Additional dependencies
168168 build-depends:
169− hspec >= 2.6.0 && < 2.9
169+ hspec >= 2.6.0 && < 2.10
170170 , QuickCheck >= 2.12.6.1 && < 2.15
171171 , quickcheck-instances >= 0.3.19 && < 0.4
172172
173173 build-tool-depends:
174− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
174+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10