git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1568 from haskell-servant/maksbotan/stackage-deps
f5a91d2Maxim Koltsov
servant-auth/servant-auth-client/servant-auth-client.cabal+2−2
compare with master
unifiedsplit
@@ -50,7 +50,7 @@ test-suite spec
50 test
50 test
51 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
51 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
52 ghc-options: -Wall
52 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
54
54
55 -- dependencies with bounds inherited from the library stanza
55 -- dependencies with bounds inherited from the library stanza
56 build-depends:
56 build-depends:
@@ -62,7 +62,7 @@ test-suite spec
62
62
63 -- test dependencies
63 -- test dependencies
64 build-depends:
64 build-depends:
65− hspec >= 2.5.5 && < 2.9
65+ hspec >= 2.5.5 && < 2.10
66 , QuickCheck >= 2.11.3 && < 2.15
66 , QuickCheck >= 2.11.3 && < 2.15
67 , aeson >= 1.3.1.1 && < 3
67 , aeson >= 1.3.1.1 && < 3
68 , bytestring >= 0.10.6.0 && < 0.12
68 , 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
64 test
64 test
65 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
65 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
66 ghc-options: -Wall
66 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
68
68
69 -- dependencies with bounds inherited from the library stanza
69 -- dependencies with bounds inherited from the library stanza
70 build-depends:
70 build-depends:
@@ -78,7 +78,7 @@ test-suite spec
78 -- test dependencies
78 -- test dependencies
79 build-depends:
79 build-depends:
80 servant-auth-docs
80 servant-auth-docs
81− , hspec >= 2.5.5 && < 2.9
81+ , hspec >= 2.5.5 && < 2.10
82 , QuickCheck >= 2.11.3 && < 2.15
82 , QuickCheck >= 2.11.3 && < 2.15
83
83
84 default-language: Haskell2010
84 default-language: Haskell2010
servant-auth/servant-auth-server/servant-auth-server.cabal+3−3
@@ -102,7 +102,7 @@ test-suite spec
102 test
102 test
103 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
103 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
104 ghc-options: -Wall
104 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
106
106
107 -- dependencies with bounds inherited from the library stanza
107 -- dependencies with bounds inherited from the library stanza
108 build-depends:
108 build-depends:
@@ -123,10 +123,10 @@ test-suite spec
123 -- test dependencies
123 -- test dependencies
124 build-depends:
124 build-depends:
125 servant-auth-server
125 servant-auth-server
126− , hspec >= 2.5.5 && < 2.8
126+ , hspec >= 2.5.5 && < 2.10
127 , QuickCheck >= 2.11.3 && < 2.15
127 , QuickCheck >= 2.11.3 && < 2.15
128 , http-client >= 0.5.13.1 && < 0.8
128 , http-client >= 0.5.13.1 && < 0.8
129− , lens-aeson >= 1.0.2 && < 1.2
129+ , lens-aeson >= 1.0.2 && < 1.3
130 , warp >= 3.2.25 && < 3.4
130 , warp >= 3.2.25 && < 3.4
131 , wreq >= 0.5.2.1 && < 0.6
131 , wreq >= 0.5.2.1 && < 0.6
132 other-modules:
132 other-modules:
servant-auth/servant-auth-swagger/servant-auth-swagger.cabal+2−2
@@ -51,7 +51,7 @@ test-suite spec
51 test
51 test
52 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
52 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
53 ghc-options: -Wall
53 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
55 -- dependencies with bounds inherited from the library stanza
55 -- dependencies with bounds inherited from the library stanza
56 build-depends:
56 build-depends:
57 base
57 base
@@ -67,7 +67,7 @@ test-suite spec
67 -- test dependencies
67 -- test dependencies
68 build-depends:
68 build-depends:
69 servant-auth-swagger
69 servant-auth-swagger
70− , hspec >= 2.5.5 && < 2.9
70+ , hspec >= 2.5.5 && < 2.10
71 , QuickCheck >= 2.11.3 && < 2.15
71 , QuickCheck >= 2.11.3 && < 2.15
72 other-modules:
72 other-modules:
73 Servant.Auth.SwaggerSpec
73 Servant.Auth.SwaggerSpec
servant-client-core/servant-client-core.cabal+2−2
@@ -104,8 +104,8 @@ test-suite spec
104 -- Additional dependencies
104 -- Additional dependencies
105 build-depends:
105 build-depends:
106 deepseq >= 1.4.2.0 && < 1.5
106 deepseq >= 1.4.2.0 && < 1.5
107− , hspec >= 2.6.0 && < 2.9
107+ , hspec >= 2.6.0 && < 2.10
108 , QuickCheck >= 2.12.6.1 && < 2.15
108 , QuickCheck >= 2.12.6.1 && < 2.15
109
109
110 build-tool-depends:
110 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
124 -- Additional dependencies
124 -- Additional dependencies
125 build-depends:
125 build-depends:
126 entropy >= 0.4.1.3 && < 0.5
126 entropy >= 0.4.1.3 && < 0.5
127− , hspec >= 2.6.0 && < 2.9
127+ , hspec >= 2.6.0 && < 2.10
128 , HUnit >= 1.6.0.0 && < 1.7
128 , HUnit >= 1.6.0.0 && < 1.7
129 , network >= 2.8.0.0 && < 3.2
129 , network >= 2.8.0.0 && < 3.2
130 , QuickCheck >= 2.12.6.1 && < 2.15
130 , QuickCheck >= 2.12.6.1 && < 2.15
@@ -133,7 +133,7 @@ test-suite spec
133 , tdigest >= 0.2 && < 0.3
133 , tdigest >= 0.2 && < 0.3
134
134
135 build-tool-depends:
135 build-tool-depends:
136− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
136+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10
137
137
138test-suite readme
138test-suite readme
139 type: exitcode-stdio-1.0
139 type: exitcode-stdio-1.0
servant-foreign/servant-foreign.cabal+2−2
@@ -74,7 +74,7 @@ test-suite spec
74
74
75 -- Additional dependencies
75 -- Additional dependencies
76 build-depends:
76 build-depends:
77− hspec >= 2.6.0 && <2.9
77+ hspec >= 2.6.0 && <2.10
78 build-tool-depends:
78 build-tool-depends:
79− hspec-discover:hspec-discover >=2.6.0 && <2.9
79+ hspec-discover:hspec-discover >=2.6.0 && <2.10
80 default-language: Haskell2010
80 default-language: Haskell2010
servant-http-streams/servant-http-streams.cabal+2−2
@@ -112,7 +112,7 @@ test-suite spec
112 -- Additional dependencies
112 -- Additional dependencies
113 build-depends:
113 build-depends:
114 entropy >= 0.4.1.3 && < 0.5
114 entropy >= 0.4.1.3 && < 0.5
115− , hspec >= 2.6.0 && < 2.9
115+ , hspec >= 2.6.0 && < 2.10
116 , HUnit >= 1.6.0.0 && < 1.7
116 , HUnit >= 1.6.0.0 && < 1.7
117 , network >= 2.8.0.0 && < 3.2
117 , network >= 2.8.0.0 && < 3.2
118 , QuickCheck >= 2.12.6.1 && < 2.15
118 , QuickCheck >= 2.12.6.1 && < 2.15
@@ -121,7 +121,7 @@ test-suite spec
121 , tdigest >= 0.2 && < 0.3
121 , tdigest >= 0.2 && < 0.3
122
122
123 build-tool-depends:
123 build-tool-depends:
124− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
124+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10
125
125
126test-suite readme
126test-suite readme
127 type: exitcode-stdio-1.0
127 type: exitcode-stdio-1.0
servant-server/servant-server.cabal+2−2
@@ -159,7 +159,7 @@ test-suite spec
159 build-depends:
159 build-depends:
160 aeson >= 1.4.1.0 && < 3
160 aeson >= 1.4.1.0 && < 3
161 , directory >= 1.3.0.0 && < 1.4
161 , directory >= 1.3.0.0 && < 1.4
162− , hspec >= 2.6.0 && < 2.9
162+ , hspec >= 2.6.0 && < 2.10
163 , hspec-wai >= 0.10.1 && < 0.12
163 , hspec-wai >= 0.10.1 && < 0.12
164 , QuickCheck >= 2.12.6.1 && < 2.15
164 , QuickCheck >= 2.12.6.1 && < 2.15
165 , should-not-typecheck >= 2.1.0 && < 2.2
165 , should-not-typecheck >= 2.1.0 && < 2.2
@@ -167,4 +167,4 @@ test-suite spec
167 , wai-extra >= 3.0.24.3 && < 3.2
167 , wai-extra >= 3.0.24.3 && < 3.2
168
168
169 build-tool-depends:
169 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
77 , http-media >=0.7.1.3 && <0.9
77 , http-media >=0.7.1.3 && <0.9
78 , insert-ordered-containers >=0.2.1.0 && <0.3
78 , insert-ordered-containers >=0.2.1.0 && <0.3
79 , lens >=4.17 && <6
79 , lens >=4.17 && <6
80− , servant >=0.18.1 && <0.20
80+ , servant >=0.18.2 && <0.20
81 , singleton-bool >=0.1.4 && <0.2
81 , singleton-bool >=0.1.4 && <0.2
82 , swagger2 >=2.3.0.1 && <3
82 , swagger2 >=2.3.0.1 && <3
83 , text >=1.2.3.0 && <2.1
83 , text >=1.2.3.0 && <2.1
@@ -106,14 +106,14 @@ test-suite spec
106 type: exitcode-stdio-1.0
106 type: exitcode-stdio-1.0
107 hs-source-dirs: test
107 hs-source-dirs: test
108 main-is: Spec.hs
108 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
110 build-depends: base
110 build-depends: base
111 , base-compat
111 , base-compat
112 , aeson >=1.4.2.0 && <3
112 , aeson >=1.4.2.0 && <3
113− , hspec >=2.6.0 && <2.8
113+ , hspec >=2.6.0 && <2.10
114 , QuickCheck
114 , QuickCheck
115 , lens
115 , lens
116− , lens-aeson >=1.0.2 && <1.2
116+ , lens-aeson >=1.0.2 && <1.3
117 , servant
117 , servant
118 , servant-swagger
118 , servant-swagger
119 , swagger2
119 , swagger2
servant-swagger/src/Servant/Swagger.hs+3−3
@@ -160,11 +160,11 @@ import Servant.Swagger.Internal.Orphans ()
160-- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary
160-- >>> instance Arbitrary UserId where arbitrary = UserId <$> arbitrary
161-- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI)
161-- >>> hspec $ validateEveryToJSON (Proxy :: Proxy UserAPI)
162-- <BLANKLINE>
162-- <BLANKLINE>
163−-- [User]
163+-- [User]...
164-- ...
164-- ...
165−-- User
165+-- User...
166-- ...
166-- ...
167−-- UserId
167+-- UserId...
168-- ...
168-- ...
169-- Finished in ... seconds
169-- Finished in ... seconds
170-- 3 examples, 0 failures
170-- 3 examples, 0 failures
servant-swagger/src/Servant/Swagger/Internal/Test.hs+6−6
@@ -53,10 +53,10 @@ import Servant.Swagger.Internal.TypeLevel
53--
53--
54-- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI)
54-- >>> hspec $ context "ToJSON matches ToSchema" $ validateEveryToJSON (Proxy :: Proxy UserAPI)
55-- <BLANKLINE>
55-- <BLANKLINE>
56−-- ToJSON matches ToSchema
56+-- ToJSON matches ToSchema...
57−-- User
57+-- User...
58-- ...
58-- ...
59−-- UserId
59+-- UserId...
60-- ...
60-- ...
61-- Finished in ... seconds
61-- Finished in ... seconds
62-- 2 examples, 0 failures
62-- 2 examples, 0 failures
@@ -118,11 +118,11 @@ validateEveryToJSONWithPatternChecker checker _ = props
118-- :}
118-- :}
119-- <BLANKLINE>
119-- <BLANKLINE>
120-- read . show == id
120-- read . show == id
121−-- Bool
121+-- Bool...
122-- ...
122-- ...
123−-- Int
123+-- Int...
124-- ...
124-- ...
125−-- [Char]
125+-- [Char]...
126-- ...
126-- ...
127-- Finished in ... seconds
127-- Finished in ... seconds
128-- 3 examples, 0 failures
128-- 3 examples, 0 failures
servant/servant.cabal+2−2
@@ -166,9 +166,9 @@ test-suite spec
166
166
167 -- Additional dependencies
167 -- Additional dependencies
168 build-depends:
168 build-depends:
169− hspec >= 2.6.0 && < 2.9
169+ hspec >= 2.6.0 && < 2.10
170 , QuickCheck >= 2.12.6.1 && < 2.15
170 , QuickCheck >= 2.12.6.1 && < 2.15
171 , quickcheck-instances >= 0.3.19 && < 0.4
171 , quickcheck-instances >= 0.3.19 && < 0.4
172
172
173 build-tool-depends:
173 build-tool-depends:
174− hspec-discover:hspec-discover >= 2.6.0 && < 2.9
174+ hspec-discover:hspec-discover >= 2.6.0 && < 2.10