Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow newer hspec, free #1690

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Allow newer hspec, free #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions servant-auth/servant-auth-client/servant-auth-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12

-- dependencies with bounds inherited from the library stanza
build-depends:
Expand All @@ -62,7 +62,7 @@ test-suite spec

-- test dependencies
build-depends:
hspec >= 2.5.5 && < 2.11
hspec >= 2.5.5 && < 2.12
, QuickCheck >= 2.11.3 && < 2.15
, aeson >= 1.3.1.1 && < 3
, bytestring >= 0.10.6.0 && < 0.12
Expand Down
4 changes: 2 additions & 2 deletions servant-auth/servant-auth-docs/servant-auth-docs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12

-- dependencies with bounds inherited from the library stanza
build-depends:
Expand All @@ -78,7 +78,7 @@ test-suite spec
-- test dependencies
build-depends:
servant-auth-docs
, hspec >= 2.5.5 && < 2.11
, hspec >= 2.5.5 && < 2.12
, QuickCheck >= 2.11.3 && < 2.15

default-language: Haskell2010
6 changes: 3 additions & 3 deletions servant-auth/servant-auth-server/servant-auth-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ library
, jose >= 0.10 && < 0.11
, lens >= 4.16.1 && < 5.3
, memory >= 0.14.16 && < 0.19
, monad-time >= 0.3.1.0 && < 0.4
, monad-time >= 0.3.1.0 && < 0.5
, mtl ^>= 2.2.2 || ^>= 2.3.1
, servant >= 0.13 && < 0.21
, servant-auth == 0.4.*
Expand Down Expand Up @@ -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.11
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.12

-- dependencies with bounds inherited from the library stanza
build-depends:
Expand All @@ -123,7 +123,7 @@ test-suite spec
-- test dependencies
build-depends:
servant-auth-server
, hspec >= 2.5.5 && < 2.11
, hspec >= 2.5.5 && < 2.12
, QuickCheck >= 2.11.3 && < 2.15
, http-client >= 0.5.13.1 && < 0.8
, lens-aeson >= 1.0.2 && < 1.3
Expand Down
4 changes: 2 additions & 2 deletions servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.11
build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.12
-- dependencies with bounds inherited from the library stanza
build-depends:
base
Expand All @@ -63,7 +63,7 @@ test-suite spec
-- test dependencies
build-depends:
servant-auth-swagger
, hspec >= 2.5.5 && < 2.11
, hspec >= 2.5.5 && < 2.12
, QuickCheck >= 2.11.3 && < 2.15
other-modules:
Servant.Auth.SwaggerSpec
Expand Down
2 changes: 1 addition & 1 deletion servant-auth/servant-auth/servant-auth.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ library
build-depends:
base >= 4.10 && < 4.19
, containers >= 0.6 && < 0.7
, aeson >= 1.3.1.1 && < 3
, aeson >= 2.0 && < 3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ysangkok is this really necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the version of jose we use doesn't permit aeson 1.x. So I think it is better to set the tighten the bound here to reflect what can actually be chosen. So no, it is not necessary, but having 1.3.1.1 is confusing, and therefore I think we should get rid of it.

, jose >= 0.10 && < 0.11
, lens >= 4.16.1 && < 5.3
, servant >= 0.15 && < 0.21
Expand Down
6 changes: 3 additions & 3 deletions servant-client-core/servant-client-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ library
, base-compat >= 0.10.5 && < 0.14
, base64-bytestring >= 1.0.0.1 && < 1.3
, exceptions >= 0.10.0 && < 0.11
, free >= 5.1 && < 5.2
, free >= 5.1 && < 5.3
, http-media >= 0.7.1.3 && < 0.9
, http-types >= 0.12.2 && < 0.13
, network-uri >= 2.6.1.0 && < 2.7
Expand Down Expand Up @@ -104,8 +104,8 @@ test-suite spec
-- Additional dependencies
build-depends:
deepseq >= 1.4.2.0 && < 1.5
, hspec >= 2.6.0 && < 2.11
, hspec >= 2.6.0 && < 2.12
, QuickCheck >= 2.12.6.1 && < 2.15

build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && <2.11
hspec-discover:hspec-discover >= 2.6.0 && <2.12
6 changes: 3 additions & 3 deletions servant-client-ghcjs/servant-client-ghcjs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ library
, mtl ^>=2.2.2 || ^>=2.3.1
, semigroupoids >=5.3 && <6.1
, string-conversions >=0.3 && <0.5
, transformers >=0.3 && <0.6
, transformers >=0.3 && <0.7
, transformers-base >=0.4.4 && <0.5

-- strict, as we re-export stuff
build-depends:
servant >=0.16 && <0.20
, servant-client-core >=0.16 && <0.20
servant >=0.20 && <0.21
, servant-client-core >=0.20 && <0.21

hs-source-dirs: src
default-language: Haskell2010
Expand Down
4 changes: 2 additions & 2 deletions servant-client/servant-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ test-suite spec
-- Additional dependencies
build-depends:
entropy >= 0.4.1.3 && < 0.5
, hspec >= 2.6.0 && < 2.11
, hspec >= 2.6.0 && < 2.12
, HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.15
, servant >= 0.20 && < 0.21
, servant-server >= 0.20 && < 0.21

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

test-suite readme
type: exitcode-stdio-1.0
Expand Down
4 changes: 2 additions & 2 deletions servant-foreign/servant-foreign.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test-suite spec

-- Additional dependencies
build-depends:
hspec >= 2.6.0 && <2.11
hspec >= 2.6.0 && <2.12
build-tool-depends:
hspec-discover:hspec-discover >=2.6.0 && <2.11
hspec-discover:hspec-discover >=2.6.0 && <2.12
default-language: Haskell2010
4 changes: 2 additions & 2 deletions servant-http-streams/servant-http-streams.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ test-suite spec
-- Additional dependencies
build-depends:
entropy >= 0.4.1.3 && < 0.5
, hspec >= 2.6.0 && < 2.11
, hspec >= 2.6.0 && < 2.12
, HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.15
, servant-server >= 0.20 && < 0.21
, servant >= 0.20 && < 0.21

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

test-suite readme
type: exitcode-stdio-1.0
Expand Down
4 changes: 2 additions & 2 deletions servant-server/servant-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ test-suite spec
build-depends:
aeson >= 1.4.1.0 && < 3
, directory >= 1.3.0.0 && < 1.4
, hspec >= 2.6.0 && < 2.11
, hspec >= 2.6.0 && < 2.12
, hspec-wai >= 0.10.1 && < 0.12
, QuickCheck >= 2.12.6.1 && < 2.15
, should-not-typecheck >= 2.1.0 && < 2.2
, temporary >= 1.3 && < 1.4
, wai-extra >= 3.0.24.3 && < 3.2

build-tool-depends:
hspec-discover:hspec-discover >= 2.6.0 && <2.11
hspec-discover:hspec-discover >= 2.6.0 && <2.12
4 changes: 2 additions & 2 deletions servant-swagger/servant-swagger.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.12
build-depends: base
, base-compat
, aeson >=1.4.2.0 && <3
, hspec >=2.6.0 && <2.11
, hspec >=2.6.0 && <2.12
, QuickCheck
, lens
, lens-aeson >=1.0.2 && <1.3
Expand Down
4 changes: 2 additions & 2 deletions servant/servant.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ test-suite spec

-- Additional dependencies
build-depends:
hspec >= 2.6.0 && < 2.11
hspec >= 2.6.0 && < 2.12
, 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.11
hspec-discover:hspec-discover >= 2.6.0 && < 2.12
Loading