Skip to content

Commit 5da422b

Browse files
ysangkokysangkok
authored
Merge pull request #1690 from haskell-servant/janus/allow-hspec-free
Allow newer hspec, free
2 parents b5f0e9e + a1595a8 commit 5da422b

File tree

13 files changed

+28
-28
lines changed

13 files changed

+28
-28
lines changed

‎servant-auth/servant-auth-client/servant-auth-client.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.11
53+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12
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.11
65+
hspec >= 2.5.5 && < 2.12
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.11
67+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12
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.11
81+
, hspec >= 2.5.5 && < 2.12
8282
, QuickCheck >= 2.11.3 && < 2.15
8383

8484
default-language: Haskell2010

‎servant-auth/servant-auth-server/servant-auth-server.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ library
4444
, jose >= 0.10 && < 0.11
4545
, lens >= 4.16.1 && < 5.3
4646
, memory >= 0.14.16 && < 0.19
47-
, monad-time >= 0.3.1.0 && < 0.4
47+
, monad-time >= 0.3.1.0 && < 0.5
4848
, mtl ^>= 2.2.2 || ^>= 2.3.1
4949
, servant >= 0.13 && < 0.21
5050
, servant-auth == 0.4.*
@@ -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.11
105+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12
106106

107107
-- dependencies with bounds inherited from the library stanza
108108
build-depends:
@@ -123,7 +123,7 @@ test-suite spec
123123
-- test dependencies
124124
build-depends:
125125
servant-auth-server
126-
, hspec >= 2.5.5 && < 2.11
126+
, hspec >= 2.5.5 && < 2.12
127127
, QuickCheck >= 2.11.3 && < 2.15
128128
, http-client >= 0.5.13.1 && < 0.8
129129
, lens-aeson >= 1.0.2 && < 1.3

‎servant-auth/servant-auth-swagger/servant-auth-swagger.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ test-suite spec
4949
test
5050
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
5151
ghc-options: -Wall
52-
build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.11
52+
build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.12
5353
-- dependencies with bounds inherited from the library stanza
5454
build-depends:
5555
base
@@ -63,7 +63,7 @@ test-suite spec
6363
-- test dependencies
6464
build-depends:
6565
servant-auth-swagger
66-
, hspec >= 2.5.5 && < 2.11
66+
, hspec >= 2.5.5 && < 2.12
6767
, QuickCheck >= 2.11.3 && < 2.15
6868
other-modules:
6969
Servant.Auth.SwaggerSpec

‎servant-auth/servant-auth/servant-auth.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ library
3535
build-depends:
3636
base >= 4.10 && < 4.19
3737
, containers >= 0.6 && < 0.7
38-
, aeson >= 1.3.1.1 && < 3
38+
, aeson >= 2.0 && < 3
3939
, jose >= 0.10 && < 0.11
4040
, lens >= 4.16.1 && < 5.3
4141
, servant >= 0.15 && < 0.21

‎servant-client-core/servant-client-core.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ library
7474
, base-compat >= 0.10.5 && < 0.14
7575
, base64-bytestring >= 1.0.0.1 && < 1.3
7676
, exceptions >= 0.10.0 && < 0.11
77-
, free >= 5.1 && < 5.2
77+
, free >= 5.1 && < 5.3
7878
, http-media >= 0.7.1.3 && < 0.9
7979
, http-types >= 0.12.2 && < 0.13
8080
, network-uri >= 2.6.1.0 && < 2.7
@@ -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.11
107+
, hspec >= 2.6.0 && < 2.12
108108
, QuickCheck >= 2.12.6.1 && < 2.15
109109

110110
build-tool-depends:
111-
hspec-discover:hspec-discover >= 2.6.0 && <2.11
111+
hspec-discover:hspec-discover >= 2.6.0 && <2.12

‎servant-client-ghcjs/servant-client-ghcjs.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ library
5151
, mtl ^>=2.2.2 || ^>=2.3.1
5252
, semigroupoids >=5.3 && <6.1
5353
, string-conversions >=0.3 && <0.5
54-
, transformers >=0.3 && <0.6
54+
, transformers >=0.3 && <0.7
5555
, transformers-base >=0.4.4 && <0.5
5656

5757
-- strict, as we re-export stuff
5858
build-depends:
59-
servant >=0.16 && <0.20
60-
, servant-client-core >=0.16 && <0.20
59+
servant >=0.20 && <0.21
60+
, servant-client-core >=0.20 && <0.21
6161

6262
hs-source-dirs: src
6363
default-language: Haskell2010

‎servant-client/servant-client.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ test-suite spec
124124
-- Additional dependencies
125125
build-depends:
126126
entropy >= 0.4.1.3 && < 0.5
127-
, hspec >= 2.6.0 && < 2.11
127+
, hspec >= 2.6.0 && < 2.12
128128
, HUnit >= 1.6.0.0 && < 1.7
129129
, network >= 2.8.0.0 && < 3.2
130130
, QuickCheck >= 2.12.6.1 && < 2.15
131131
, servant >= 0.20 && < 0.21
132132
, servant-server >= 0.20 && < 0.21
133133

134134
build-tool-depends:
135-
hspec-discover:hspec-discover >= 2.6.0 && < 2.11
135+
hspec-discover:hspec-discover >= 2.6.0 && < 2.12
136136

137137
test-suite readme
138138
type: exitcode-stdio-1.0

‎servant-foreign/servant-foreign.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test-suite spec
7474

7575
-- Additional dependencies
7676
build-depends:
77-
hspec >= 2.6.0 && <2.11
77+
hspec >= 2.6.0 && <2.12
7878
build-tool-depends:
79-
hspec-discover:hspec-discover >=2.6.0 && <2.11
79+
hspec-discover:hspec-discover >=2.6.0 && <2.12
8080
default-language: Haskell2010

‎servant-http-streams/servant-http-streams.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ test-suite spec
112112
-- Additional dependencies
113113
build-depends:
114114
entropy >= 0.4.1.3 && < 0.5
115-
, hspec >= 2.6.0 && < 2.11
115+
, hspec >= 2.6.0 && < 2.12
116116
, HUnit >= 1.6.0.0 && < 1.7
117117
, network >= 2.8.0.0 && < 3.2
118118
, QuickCheck >= 2.12.6.1 && < 2.15
119119
, servant-server >= 0.20 && < 0.21
120120
, servant >= 0.20 && < 0.21
121121

122122
build-tool-depends:
123-
hspec-discover:hspec-discover >= 2.6.0 && < 2.11
123+
hspec-discover:hspec-discover >= 2.6.0 && < 2.12
124124

125125
test-suite readme
126126
type: exitcode-stdio-1.0

0 commit comments

Comments
 (0)