Skip to content

Commit 030cbbc

Browse files
authored
Merge pull request #895 from phadej/lower-bounds
Bump lower bounds
2 parents bf289cc + f9963d3 commit 030cbbc

File tree

10 files changed

+346
-218
lines changed

10 files changed

+346
-218
lines changed

doc/tutorial/tutorial.cabal

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,60 @@ extra-source-files:
2222
static/ui.js
2323

2424
library
25+
default-language: Haskell2010
26+
ghc-options: -Wall -pgmL markdown-unlit
2527
exposed-modules: ApiType
2628
, Authentication
2729
, Client
2830
, Docs
2931
, Javascript
3032
, Server
31-
build-depends: base == 4.*
32-
, base-compat
33-
, text
34-
, aeson
35-
, aeson-compat
36-
, blaze-html
37-
, directory
38-
, blaze-markup
39-
, containers
40-
, servant == 0.12.*
41-
, servant-server == 0.12.*
42-
, servant-client == 0.12.*
43-
, servant-docs >= 0.11.1 && <0.12
44-
, servant-js >= 0.9 && <0.10
45-
, warp
46-
, http-api-data
47-
, http-media
48-
, lucid
49-
, time
50-
, string-conversions
51-
, bytestring
52-
, attoparsec
53-
, mtl >=2.1 && <2.3
54-
, mtl-compat
55-
, random
56-
, js-jquery
57-
, wai
58-
, http-types
59-
, transformers
60-
, markdown-unlit >= 0.4
61-
, http-client
62-
, cookie
63-
default-language: Haskell2010
64-
ghc-options: -Wall -pgmL markdown-unlit
65-
build-tool-depends: markdown-unlit:markdown-unlit
33+
34+
-- Packages `servant` depends on.
35+
-- We don't need to specify bounds here as this package is never released.
36+
build-depends:
37+
base >= 4.7 && <4.11
38+
, aeson
39+
, aeson-compat
40+
, attoparsec
41+
, base-compat
42+
, bytestring
43+
, containers
44+
, directory
45+
, http-api-data
46+
, http-client
47+
, http-media
48+
, http-types
49+
, mtl
50+
, string-conversions
51+
, text
52+
, transformers
53+
, wai
54+
, warp
55+
56+
-- Servant dependencies
57+
build-depends:
58+
servant
59+
, servant-server
60+
, servant-client
61+
, servant-docs
62+
63+
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
64+
-- Here can be exceptions if we really need features from the newer versions.
65+
build-depends:
66+
blaze-html >= 0.9.0.1 && < 0.10
67+
, blaze-markup >= 0.8.0.0 && < 0.9
68+
, cookie >= 0.4.3 && < 0.5
69+
, js-jquery >= 3.2.1 && < 3.3
70+
, lucid >= 2.9.9 && < 2.10
71+
, mtl-compat >= 0.2.1 && < 0.3
72+
, random >= 1.1 && < 1.2
73+
, servant-js >= 0.9 && < 0.10
74+
, time >= 1.4.2 && < 1.9
75+
76+
-- For legacy tools, we need to specify build-depends too
77+
build-depends: markdown-unlit >= 0.4.1 && <0.5
78+
build-tool-depends: markdown-unlit:markdown-unlit >= 0.4.1 && <0.5
6679

6780
test-suite spec
6881
type: exitcode-stdio-1.0
@@ -73,7 +86,7 @@ test-suite spec
7386
other-modules: JavascriptSpec
7487
build-tool-depends:
7588
hspec-discover:hspec-discover
76-
build-depends: base == 4.*
89+
build-depends: base
7790
, tutorial
7891
, hspec
7992
, hspec-wai

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

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,39 @@ library
3939
Servant.Client.Core.Internal.HasClient
4040
Servant.Client.Core.Internal.Request
4141
Servant.Client.Core.Internal.RunClient
42+
43+
-- Bundled with GHC: Lower bound to not force re-installs
44+
-- text and mtl are bundled starting with GHC-8.4
45+
--
46+
-- note: mtl lower bound is so low because of GHC-7.8
4247
build-depends:
4348
base >= 4.7 && < 4.11
44-
, base-compat >= 0.9.1 && < 0.10
45-
, base64-bytestring >= 1.0.0.1 && < 1.1
46-
, bytestring >= 0.10 && < 0.11
47-
, containers >= 0.5 && < 0.6
48-
, exceptions >= 0.8 && < 0.9
49-
, generics-sop >= 0.1.0.0 && < 0.4
50-
, http-api-data >= 0.3.6 && < 0.4
51-
, http-media >= 0.6.2 && < 0.8
52-
, http-types >= 0.8.6 && < 0.12
49+
, bytestring >= 0.10.4.0 && < 0.11
50+
, containers >= 0.5.5.1 && < 0.6
5351
, mtl >= 2.1 && < 2.3
54-
, network-uri >= 2.6 && < 2.7
55-
, safe >= 0.3.9 && < 0.4
56-
, servant == 0.12.*
57-
, text >= 1.2 && < 1.3
52+
, text >= 1.2.3.0 && < 1.3
53+
5854
if !impl(ghc >= 8.0)
5955
build-depends:
60-
semigroups >=0.16.2.2 && <0.19
56+
semigroups >=0.18.3 && <0.19
57+
58+
-- Servant dependencies
59+
build-depends:
60+
servant == 0.12.*
61+
62+
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
63+
-- Here can be exceptions if we really need features from the newer versions.
64+
build-depends:
65+
base-compat >= 0.9.3 && < 0.10
66+
, base64-bytestring >= 1.0.0.1 && < 1.1
67+
, exceptions >= 0.8.3 && < 0.9
68+
, generics-sop >= 0.3.1.0 && < 0.4
69+
, http-api-data >= 0.3.7.1 && < 0.4
70+
, http-media >= 0.7.1.1 && < 0.8
71+
, http-types >= 0.9.1 && < 0.12
72+
, network-uri >= 2.6.1.0 && < 2.7
73+
, safe >= 0.3.15 && < 0.4
74+
6175
hs-source-dirs: src
6276
default-language: Haskell2010
6377
ghc-options: -Wall
@@ -69,14 +83,20 @@ test-suite spec
6983
default-language: Haskell2010
7084
hs-source-dirs: test
7185
main-is: Spec.hs
86+
other-modules:
87+
Servant.Client.Core.Internal.BaseUrlSpec
88+
89+
-- Dependencies inherited from the library. No need to specify bounds.
7290
build-depends:
7391
base
7492
, base-compat
75-
, deepseq
7693
, servant-client-core
77-
, hspec == 2.*
78-
, QuickCheck >= 2.7 && < 2.11
94+
95+
-- Additonal dependencies
96+
build-depends:
97+
deepseq >= 1.3.0.2 && <1.5
98+
, hspec >= 2.4.4 && <2.5
99+
, QuickCheck >= 2.10.1 && < 2.12
100+
79101
build-tool-depends:
80-
hspec-discover:hspec-discover
81-
other-modules:
82-
Servant.Client.Core.Internal.BaseUrlSpec
102+
hspec-discover:hspec-discover >= 2.4.4 && <2.5

servant-client/servant-client.cabal

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,39 @@ library
3535
exposed-modules:
3636
Servant.Client
3737
Servant.Client.Internal.HttpClient
38+
39+
-- Bundled with GHC: Lower bound to not force re-installs
40+
-- text and mtl are bundled starting with GHC-8.4
41+
--
42+
-- note: mtl lower bound is so low because of GHC-7.8
3843
build-depends:
3944
base >= 4.7 && < 4.11
40-
, base-compat >= 0.9.1 && < 0.10
41-
, bytestring >= 0.10 && < 0.11
42-
, aeson >= 0.7 && < 1.3
43-
, attoparsec >= 0.12 && < 0.14
44-
, containers >= 0.5 && < 0.6
45-
, http-client >= 0.4.30 && < 0.6
46-
, http-client-tls >= 0.2.2 && < 0.4
47-
, http-media >= 0.6.2 && < 0.8
48-
, http-types >= 0.8.6 && < 0.12
49-
, exceptions >= 0.8 && < 0.9
50-
, monad-control >= 1.0.0.4 && < 1.1
45+
, bytestring >= 0.10.4.0 && < 0.11
46+
, containers >= 0.5.5.1 && < 0.6
5147
, mtl >= 2.1 && < 2.3
52-
, semigroupoids >= 4.3 && < 5.3
53-
, servant-client-core == 0.12.*
54-
, text >= 1.2 && < 1.3
55-
, transformers >= 0.3 && < 0.6
48+
, text >= 1.2.3.0 && < 1.3
49+
, transformers >= 0.3.0.0 && < 0.6
50+
51+
-- Servant dependencies
52+
build-depends:
53+
servant-client-core == 0.12.*
54+
55+
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
56+
-- Here can be exceptions if we really need features from the newer versions.
57+
build-depends:
58+
aeson >= 1.2.3.0 && < 1.3
59+
, base-compat >= 0.9.3 && < 0.10
60+
, attoparsec >= 0.13.2.0 && < 0.14
61+
, http-client >= 0.5.7.1 && < 0.6
62+
, http-client-tls >= 0.3.5.1 && < 0.4
63+
, http-media >= 0.7.1.1 && < 0.8
64+
, http-types >= 0.9.1 && < 0.12
65+
, exceptions >= 0.8.3 && < 0.9
66+
, monad-control >= 1.0.0.4 && < 1.1
67+
, semigroupoids >= 5.2.1 && < 5.3
5668
, transformers-base >= 0.4.4 && < 0.5
57-
, transformers-compat >= 0.4 && < 0.6
69+
, transformers-compat >= 0.5.1 && < 0.6
70+
5871
hs-source-dirs: src
5972
default-language: Haskell2010
6073
ghc-options: -Wall
@@ -68,34 +81,40 @@ test-suite spec
6881
default-language: Haskell2010
6982
hs-source-dirs: test
7083
main-is: Spec.hs
71-
build-tool-depends:
72-
hspec-discover:hspec-discover
7384
other-modules:
7485
Servant.ClientSpec
7586
Servant.StreamSpec
87+
88+
-- Dependencies inherited from the library. No need to specify bounds.
7689
build-depends:
77-
base == 4.*
90+
base
7891
, aeson
7992
, base-compat
8093
, bytestring
8194
, containers
82-
, deepseq
83-
, hspec == 2.*
8495
, http-api-data
8596
, http-client
8697
, http-media
8798
, http-types
88-
, HUnit
8999
, mtl
90-
, network >= 2.6
91-
, QuickCheck >= 2.7
92-
, servant
93100
, servant-client
94101
, servant-client-core
95-
, servant-server == 0.12.*
96102
, text
97103
, transformers
98104
, transformers-compat
99105
, wai
100106
, warp
101-
, generics-sop
107+
108+
-- Additonal dependencies
109+
build-depends:
110+
deepseq >= 1.3.0.2 && < 1.5
111+
, generics-sop >= 0.3.1.0 && < 0.4
112+
, hspec >= 2.4.4 && < 2.5
113+
, HUnit >= 1.6 && < 1.7
114+
, network >= 2.6.3.2 && < 2.7
115+
, QuickCheck >= 2.10.1 && < 2.12
116+
, servant == 0.12.*
117+
, servant-server == 0.12.*
118+
119+
build-tool-depends:
120+
hspec-discover:hspec-discover >= 2.4.4 && < 2.5

servant-docs/servant-docs.cabal

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,39 @@ library
3535
Servant.Docs
3636
, Servant.Docs.Internal
3737
, Servant.Docs.Internal.Pretty
38+
39+
-- Bundled with GHC: Lower bound to not force re-installs
40+
-- text and mtl are bundled starting with GHC-8.4
41+
--
42+
-- note: mtl lower bound is so low because of GHC-7.8
3843
build-depends:
39-
base >=4.7 && <5
40-
, base-compat >= 0.9.1 && <0.10
41-
, aeson
42-
, aeson-pretty
43-
, bytestring >= 0.10.4.0 && <0.11
44-
, case-insensitive
45-
, hashable
46-
, http-media >= 0.6
47-
, http-types >= 0.7
48-
, lens
49-
, servant == 0.12.*
50-
, string-conversions
51-
, text
52-
, unordered-containers >=0.2.5.0
53-
, control-monad-omega >= 0.3.1 && <0.4
44+
base >= 4.7 && < 4.11
45+
, bytestring >= 0.10.4.0 && < 0.11
46+
, text >= 1.2.3.0 && < 1.3
47+
5448
if !impl(ghc >= 8.0)
5549
build-depends:
56-
semigroups >=0.17 && <0.19
50+
semigroups >=0.18.3 && <0.19
51+
52+
-- Servant dependencies
53+
build-depends:
54+
servant == 0.12.*
55+
56+
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
57+
-- Here can be exceptions if we really need features from the newer versions.
58+
build-depends:
59+
aeson >= 1.2.3.0 && < 1.3
60+
, aeson-pretty >= 0.8.5 && < 0.9
61+
, base-compat >= 0.9.3 && < 0.10
62+
, case-insensitive >= 1.2.0.10 && < 1.3
63+
, control-monad-omega >= 0.3.1 && < 0.4
64+
, hashable >= 1.2.6.1 && < 1.3
65+
, http-media >= 0.7.1.1 && < 0.8
66+
, http-types >= 0.9.1 && < 0.12
67+
, lens >= 4.15.4 && < 4.16
68+
, string-conversions >= 0.4.0.1 && < 0.5
69+
, unordered-containers >= 0.2.8.0 && < 0.3
70+
5771
hs-source-dirs: src
5872
default-language: Haskell2010
5973
ghc-options: -Wall
@@ -76,19 +90,25 @@ executable greet-docs
7690
default-language: Haskell2010
7791

7892
test-suite spec
93+
default-language: Haskell2010
7994
type: exitcode-stdio-1.0
8095
main-is: Spec.hs
8196
other-modules: Servant.DocsSpec
82-
build-tool-depends:
83-
hspec-discover:hspec-discover
8497
hs-source-dirs: test
8598
ghc-options: -Wall
99+
100+
-- Dependencies inherited from the library. No need to specify bounds.
86101
build-depends:
87102
base
88103
, aeson
89-
, hspec
90104
, lens
91105
, servant
92106
, servant-docs
93107
, string-conversions
94-
default-language: Haskell2010
108+
109+
-- Additonal dependencies
110+
build-depends:
111+
hspec >= 2.4.4 && < 2.5
112+
113+
build-tool-depends:
114+
hspec-discover:hspec-discover >=2.4.4 && <2.5

0 commit comments

Comments
 (0)