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

Bump some lower bounds

Browse source 
Also drop unused dependencies
This commit is contained in:
Oleg Grenrus 2018-06-18 16:28:51 +03:00
parent 21bac09010
commit daa5d4a891
5 changed files with 68 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,12 +51,11 @@ library
base >= 4.7 && < 4.12 base >= 4.7 && < 4.12
, bytestring >= 0.10.4.0 && < 0.11 , bytestring >= 0.10.4.0 && < 0.11
, containers >= 0.5.5.1 && < 0.6 , containers >= 0.5.5.1 && < 0.6
, mtl >= 2.1 && < 2.3
, text >= 1.2.3.0 && < 1.3 , text >= 1.2.3.0 && < 1.3
if !impl(ghc >= 8.0) if !impl(ghc >= 8.0)
build-depends: build-depends:
semigroups >=0.18.3 && <0.19 semigroups >=0.18.4 && <0.19
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
@ -65,16 +64,16 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.9.3 && < 0.11 base-compat >= 0.10.1 && < 0.11
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11 , exceptions >= 0.10.0 && < 0.11
, free >= 5.0.1 && < 5.1 , free >= 5.0.2 && < 5.1
, generics-sop >= 0.3.1.0 && < 0.4 , generics-sop >= 0.3.2.0 && < 0.4
, http-api-data >= 0.3.7.1 && < 0.4 , http-api-data >= 0.3.8.1 && < 0.4
, http-media >= 0.7.1.1 && < 0.8 , http-media >= 0.7.1.2 && < 0.8
, http-types >= 0.12 && < 0.13 , http-types >= 0.12.1 && < 0.13
, network-uri >= 2.6.1.0 && < 2.7 , network-uri >= 2.6.1.0 && < 2.7
, safe >= 0.3.15 && < 0.4 , safe >= 0.3.17 && < 0.4
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
@ -99,8 +98,8 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
deepseq >= 1.3.0.2 && <1.5 deepseq >= 1.3.0.2 && <1.5
, hspec >= 2.4.4 && <2.6 , hspec >= 2.4.1 && <2.6
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.11.3 && < 2.12
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && <2.6 hspec-discover:hspec-discover >= 2.5.1 && <2.6

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

@ -51,7 +51,7 @@ library
, transformers >= 0.3.0.0 && < 0.6 , transformers >= 0.3.0.0 && < 0.6
if !impl(ghc >= 8.0) if !impl(ghc >= 8.0)
build-depends: semigroups >=0.18.3 && <0.19 build-depends: semigroups >=0.18.4 && <0.19
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
@ -60,19 +60,16 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
aeson >= 1.2.3.0 && < 1.5 base-compat >= 0.10.1 && < 0.11
, base-compat >= 0.9.3 && < 0.11 , http-client >= 0.5.12 && < 0.6
, attoparsec >= 0.13.2.0 && < 0.14 , http-media >= 0.7.1.2 && < 0.8
, http-client >= 0.5.7.1 && < 0.6 , http-types >= 0.12.1 && < 0.13
, http-client-tls >= 0.3.5.1 && < 0.4 , exceptions >= 0.10.0 && < 0.11
, http-media >= 0.7.1.1 && < 0.8 , monad-control >= 1.0.2.3 && < 1.1
, http-types >= 0.12 && < 0.13 , semigroupoids >= 5.2.2 && < 5.3
, exceptions >= 0.8.3 && < 0.11 , stm >= 2.4.5.0 && < 2.5
, monad-control >= 1.0.0.4 && < 1.1 , transformers-base >= 0.4.5.2 && < 0.5
, semigroupoids >= 5.2.1 && < 5.3 , transformers-compat >= 0.6.2 && < 0.7
, stm >= 2.4.4.1 && < 2.5
, transformers-base >= 0.4.4 && < 0.5
, transformers-compat >= 0.5.1 && < 0.7
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
@ -97,10 +94,8 @@ test-suite spec
, aeson , aeson
, base-compat , base-compat
, bytestring , bytestring
, containers
, http-api-data , http-api-data
, http-client , http-client
, http-media
, http-types , http-types
, mtl , mtl
, servant-client , servant-client
@ -117,18 +112,16 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
deepseq >= 1.3.0.2 && < 1.5 generics-sop >= 0.3.2.0 && < 0.4
, generics-sop >= 0.3.1.0 && < 0.4 , hspec >= 2.5.1 && < 2.6
, hspec >= 2.4.4 && < 2.6
, HUnit >= 1.6 && < 1.7 , HUnit >= 1.6 && < 1.7
, random-bytestring >= 0.1 && < 0.2
, network >= 2.6.3.2 && < 2.8 , network >= 2.6.3.2 && < 2.8
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.10.1 && < 2.12
, servant == 0.14.* , servant == 0.14.*
, servant-server == 0.14.* , servant-server == 0.14.*
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.6 hspec-discover:hspec-discover >= 2.5.1 && < 2.6
test-suite readme test-suite readme
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0

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

@ -40,7 +40,7 @@ custom-setup
setup-depends: setup-depends:
base >= 4 && <5, base >= 4 && <5,
Cabal, Cabal,
cabal-doctest >= 1.0.1 && <1.1 cabal-doctest >= 1.0.6 && <1.1
library library
exposed-modules: exposed-modules:
@ -71,7 +71,7 @@ library
if !impl(ghc >= 8.0) if !impl(ghc >= 8.0)
build-depends: build-depends:
semigroups >= 0.18.3 && < 0.19 semigroups >= 0.18.4 && < 0.19
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
@ -80,28 +80,22 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
aeson >= 1.2.3.0 && < 1.5 base-compat >= 0.10.1 && < 0.11
, base-compat >= 0.9.3 && < 0.11
, attoparsec >= 0.13.2.0 && < 0.14
, base64-bytestring >= 1.0.0.1 && < 1.1 , base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.8.3 && < 0.11 , exceptions >= 0.10.0 && < 0.11
, http-api-data >= 0.3.7.1 && < 0.4 , http-api-data >= 0.3.8.1 && < 0.4
, http-media >= 0.7.1.1 && < 0.8 , http-media >= 0.7.1.2 && < 0.8
, http-types >= 0.12 && < 0.13 , http-types >= 0.12.1 && < 0.13
, network-uri >= 2.6.1.0 && < 2.7 , network-uri >= 2.6.1.0 && < 2.7
, monad-control >= 1.0.0.4 && < 1.1 , monad-control >= 1.0.2.3 && < 1.1
, network >= 2.6.3.2 && < 2.8 , network >= 2.6.3.5 && < 2.8
, safe >= 0.3.15 && < 0.4
, split >= 0.2.3.2 && < 0.3
, string-conversions >= 0.4.0.1 && < 0.5 , string-conversions >= 0.4.0.1 && < 0.5
, system-filepath >= 0.4 && < 0.5 , resourcet >= 1.1.11 && < 1.3
, resourcet >= 1.1.9 && < 1.3
, tagged >= 0.8.5 && < 0.9 , tagged >= 0.8.5 && < 0.9
, transformers-base >= 0.4.4 && < 0.5 , transformers-base >= 0.4.4 && < 0.5
, transformers-compat >= 0.5.1 && < 0.7 , transformers-compat >= 0.6.2 && < 0.7
, wai >= 3.2.1.1 && < 3.3 , wai >= 3.2.1.1 && < 3.3
, wai-app-static >= 3.1.6.1 && < 3.2 , wai-app-static >= 3.1.6.1 && < 3.2
, warp >= 3.2.13 && < 3.3
, word8 >= 0.1.3 && < 0.2 , word8 >= 0.1.3 && < 0.2
hs-source-dirs: src hs-source-dirs: src
@ -120,11 +114,13 @@ executable greet
base base
, servant , servant
, servant-server , servant-server
, aeson
, warp
, wai , wai
, text , text
build-depends:
aeson >= 1.3.1.1 && < 1.5
, warp >= 3.2.13 && < 3.3
test-suite spec test-suite spec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
ghc-options: -Wall ghc-options: -Wall
@ -148,13 +144,10 @@ test-suite spec
build-depends: build-depends:
base base
, base-compat , base-compat
, aeson
, base64-bytestring , base64-bytestring
, bytestring , bytestring
, exceptions
, http-types , http-types
, mtl , mtl
, network
, resourcet , resourcet
, safe , safe
, servant , servant
@ -164,27 +157,26 @@ test-suite spec
, transformers , transformers
, transformers-compat , transformers-compat
, wai , wai
, warp
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
directory >= 1.2.1.0 && < 1.4 aeson >= 1.3.1.1 && < 1.5
, hspec >= 2.4.4 && < 2.6 , directory >= 1.2.1.0 && < 1.4
, hspec-wai >= 0.9 && < 0.10 , hspec >= 2.5.1 && < 2.6
, hspec-wai >= 0.9.0 && < 0.10
, QuickCheck >= 2.11.3 && < 2.12
, should-not-typecheck >= 2.1.0 && < 2.2 , should-not-typecheck >= 2.1.0 && < 2.2
, parsec >= 3.1.11 && < 3.2 , temporary >= 1.3 && < 1.4
, QuickCheck >= 2.10.1 && < 2.12
, wai-extra >= 3.0.21.0 && < 3.1 , wai-extra >= 3.0.21.0 && < 3.1
, temporary >= 1.2.0.3 && < 1.4
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >=2.4.4 && <2.6 hspec-discover:hspec-discover >= 2.5.1 && <2.6
test-suite doctests test-suite doctests
build-depends: build-depends:
base base
, servant-server , servant-server
, doctest >= 0.13.0 && <0.16 , doctest >= 0.15.0 && <0.16
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: test/doctests.hs main-is: test/doctests.hs
buildable: True buildable: True

37
servant/servant.cabal
View file

@ -34,7 +34,7 @@ custom-setup
setup-depends: setup-depends:
base >= 4 && <5, base >= 4 && <5,
Cabal, Cabal,
cabal-doctest >= 1.0.2 && <1.1 cabal-doctest >= 1.0.6 && <1.1
library library
exposed-modules: exposed-modules:
@ -77,25 +77,25 @@ library
if !impl(ghc >= 8.0) if !impl(ghc >= 8.0)
build-depends: build-depends:
semigroups >= 0.18.3 && < 0.19 semigroups >= 0.18.4 && < 0.19
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.9.3 && < 0.11 base-compat >= 0.10.1 && < 0.11
, aeson >= 1.2.3.0 && < 1.5 , aeson >= 1.3.1.1 && < 1.5
, attoparsec >= 0.13.2.0 && < 0.14 , attoparsec >= 0.13.2.2 && < 0.14
, case-insensitive >= 1.2.0.10 && < 1.3 , case-insensitive >= 1.2.0.10 && < 1.3
, http-api-data >= 0.3.7.1 && < 0.4 , http-api-data >= 0.3.8.1 && < 0.4
, http-media >= 0.7.1.1 && < 0.8 , http-media >= 0.7.1.2 && < 0.8
, http-types >= 0.12 && < 0.13 , http-types >= 0.12.1 && < 0.13
, natural-transformation >= 0.4 && < 0.5 , natural-transformation >= 0.4 && < 0.5
, mmorph >= 1.1.0 && < 1.2 , mmorph >= 1.1.2 && < 1.2
, tagged >= 0.8.5 && < 0.9 , tagged >= 0.8.5 && < 0.9
, singleton-bool >= 0.1.2.0 && < 0.2 , singleton-bool >= 0.1.4 && < 0.2
, string-conversions >= 0.4.0.1 && < 0.5 , string-conversions >= 0.4.0.1 && < 0.5
, network-uri >= 2.6.1.0 && < 2.7 , network-uri >= 2.6.1.0 && < 2.7
, vault >= 0.3.0.7 && < 0.4 , vault >= 0.3.1.1 && < 0.4
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
@ -141,7 +141,6 @@ test-suite spec
base base
, base-compat , base-compat
, aeson , aeson
, attoparsec
, bytestring , bytestring
, servant , servant
, string-conversions , string-conversions
@ -153,23 +152,23 @@ test-suite spec
-- Additonal dependencies -- Additonal dependencies
build-depends: build-depends:
aeson-compat >= 0.3.3 && < 0.4 aeson-compat >= 0.3.7.1 && < 0.4
, hspec >= 2.4.4 && < 2.6 , hspec >= 2.5.1 && < 2.6
, QuickCheck >= 2.10.1 && < 2.12 , QuickCheck >= 2.11.3 && < 2.12
, quickcheck-instances >= 0.3.16 && < 0.4 , quickcheck-instances >= 0.3.18 && < 0.4
build-tool-depends: build-tool-depends:
hspec-discover:hspec-discover >= 2.4.4 && < 2.6 hspec-discover:hspec-discover >= 2.5.1 && < 2.6
test-suite doctests test-suite doctests
build-depends: build-depends:
base base
, servant , servant
, doctest >= 0.13.0 && <0.16 , doctest >= 0.15.0 && <0.16
-- We test Links failure with doctest, so we need extra dependencies -- We test Links failure with doctest, so we need extra dependencies
build-depends: build-depends:
hspec >= 2.4.4 && < 2.6 hspec >= 2.5.1 && < 2.6
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: test/doctests.hs main-is: test/doctests.hs

15
stack.yaml
View file

@ -1,5 +1,5 @@
# Let's try to keep resolver at the first day of the month # Let's try to keep resolver at the first day of the month
resolver: nightly-2018-03-01 resolver: nightly-2018-06-01
packages: packages:
- servant-client/ - servant-client/
- servant-client-core/ - servant-client-core/
@ -8,18 +8,5 @@ packages:
- servant-server/ - servant-server/
- servant/ - servant/
extra-deps:
- cabal-doctest-1.0.6
- http-api-data-0.3.7.2
- http-types-0.12
- text-1.2.3.0
- aeson-1.3.0.0
- exceptions-0.10.0
- aeson-compat-0.3.7.1
- free-5.0.1
- lens-4.16
- random-bytestring-0.1.3
- pcg-random-0.1.3.5
# allow-newer: true # ignores all bounds, that's a sledgehammer # allow-newer: true # ignores all bounds, that's a sledgehammer
# - doc/tutorial/ # - doc/tutorial/