Skip to content

Commit f75583d

Browse files
committed
Bump some lower bounds
Also drop unused dependencies
1 parent e552947 commit f75583d

File tree

5 files changed

+68
-98
lines changed

5 files changed

+68
-98
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ library
5151
base >= 4.7 && < 4.12
5252
, bytestring >= 0.10.4.0 && < 0.11
5353
, containers >= 0.5.5.1 && < 0.6
54-
, mtl >= 2.1 && < 2.3
5554
, text >= 1.2.3.0 && < 1.3
5655

5756
if !impl(ghc >= 8.0)
5857
build-depends:
59-
semigroups >=0.18.3 && <0.19
58+
semigroups >=0.18.4 && <0.19
6059

6160
-- Servant dependencies
6261
build-depends:
@@ -65,16 +64,16 @@ library
6564
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6665
-- Here can be exceptions if we really need features from the newer versions.
6766
build-depends:
68-
base-compat >= 0.9.3 && < 0.11
67+
base-compat >= 0.10.1 && < 0.11
6968
, base64-bytestring >= 1.0.0.1 && < 1.1
70-
, exceptions >= 0.8.3 && < 0.11
71-
, free >= 5.0.1 && < 5.1
72-
, generics-sop >= 0.3.1.0 && < 0.4
73-
, http-api-data >= 0.3.7.1 && < 0.4
74-
, http-media >= 0.7.1.1 && < 0.8
75-
, http-types >= 0.12 && < 0.13
69+
, exceptions >= 0.10.0 && < 0.11
70+
, free >= 5.0.2 && < 5.1
71+
, generics-sop >= 0.3.2.0 && < 0.4
72+
, http-api-data >= 0.3.8.1 && < 0.4
73+
, http-media >= 0.7.1.2 && < 0.8
74+
, http-types >= 0.12.1 && < 0.13
7675
, network-uri >= 2.6.1.0 && < 2.7
77-
, safe >= 0.3.15 && < 0.4
76+
, safe >= 0.3.17 && < 0.4
7877

7978
hs-source-dirs: src
8079
default-language: Haskell2010
@@ -99,8 +98,8 @@ test-suite spec
9998
-- Additonal dependencies
10099
build-depends:
101100
deepseq >= 1.3.0.2 && <1.5
102-
, hspec >= 2.4.4 && <2.6
103-
, QuickCheck >= 2.10.1 && < 2.12
101+
, hspec >= 2.4.1 && <2.6
102+
, QuickCheck >= 2.11.3 && < 2.12
104103

105104
build-tool-depends:
106-
hspec-discover:hspec-discover >= 2.4.4 && <2.6
105+
hspec-discover:hspec-discover >= 2.5.1 && <2.6

servant-client/servant-client.cabal

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ library
5151
, transformers >= 0.3.0.0 && < 0.6
5252

5353
if !impl(ghc >= 8.0)
54-
build-depends: semigroups >=0.18.3 && <0.19
54+
build-depends: semigroups >=0.18.4 && <0.19
5555

5656
-- Servant dependencies
5757
build-depends:
@@ -60,19 +60,16 @@ library
6060
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6161
-- Here can be exceptions if we really need features from the newer versions.
6262
build-depends:
63-
aeson >= 1.2.3.0 && < 1.5
64-
, base-compat >= 0.9.3 && < 0.11
65-
, attoparsec >= 0.13.2.0 && < 0.14
66-
, http-client >= 0.5.7.1 && < 0.6
67-
, http-client-tls >= 0.3.5.1 && < 0.4
68-
, http-media >= 0.7.1.1 && < 0.8
69-
, http-types >= 0.12 && < 0.13
70-
, exceptions >= 0.8.3 && < 0.11
71-
, monad-control >= 1.0.0.4 && < 1.1
72-
, semigroupoids >= 5.2.1 && < 5.3
73-
, stm >= 2.4.4.1 && < 2.5
74-
, transformers-base >= 0.4.4 && < 0.5
75-
, transformers-compat >= 0.5.1 && < 0.7
63+
base-compat >= 0.10.1 && < 0.11
64+
, http-client >= 0.5.12 && < 0.6
65+
, http-media >= 0.7.1.2 && < 0.8
66+
, http-types >= 0.12.1 && < 0.13
67+
, exceptions >= 0.10.0 && < 0.11
68+
, monad-control >= 1.0.2.3 && < 1.1
69+
, semigroupoids >= 5.2.2 && < 5.3
70+
, stm >= 2.4.5.0 && < 2.5
71+
, transformers-base >= 0.4.5.2 && < 0.5
72+
, transformers-compat >= 0.6.2 && < 0.7
7673

7774
hs-source-dirs: src
7875
default-language: Haskell2010
@@ -97,10 +94,8 @@ test-suite spec
9794
, aeson
9895
, base-compat
9996
, bytestring
100-
, containers
10197
, http-api-data
10298
, http-client
103-
, http-media
10499
, http-types
105100
, mtl
106101
, servant-client
@@ -117,18 +112,16 @@ test-suite spec
117112

118113
-- Additonal dependencies
119114
build-depends:
120-
deepseq >= 1.3.0.2 && < 1.5
121-
, generics-sop >= 0.3.1.0 && < 0.4
122-
, hspec >= 2.4.4 && < 2.6
115+
generics-sop >= 0.3.2.0 && < 0.4
116+
, hspec >= 2.5.1 && < 2.6
123117
, HUnit >= 1.6 && < 1.7
124-
, random-bytestring >= 0.1 && < 0.2
125118
, network >= 2.6.3.2 && < 2.8
126119
, QuickCheck >= 2.10.1 && < 2.12
127120
, servant == 0.14.*
128121
, servant-server == 0.14.*
129122

130123
build-tool-depends:
131-
hspec-discover:hspec-discover >= 2.4.4 && < 2.6
124+
hspec-discover:hspec-discover >= 2.5.1 && < 2.6
132125

133126
test-suite readme
134127
type: exitcode-stdio-1.0

servant-server/servant-server.cabal

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ custom-setup
4040
setup-depends:
4141
base >= 4 && <5,
4242
Cabal,
43-
cabal-doctest >= 1.0.1 && <1.1
43+
cabal-doctest >= 1.0.6 && <1.1
4444

4545
library
4646
exposed-modules:
@@ -71,7 +71,7 @@ library
7171

7272
if !impl(ghc >= 8.0)
7373
build-depends:
74-
semigroups >= 0.18.3 && < 0.19
74+
semigroups >= 0.18.4 && < 0.19
7575

7676
-- Servant dependencies
7777
build-depends:
@@ -80,28 +80,22 @@ library
8080
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8181
-- Here can be exceptions if we really need features from the newer versions.
8282
build-depends:
83-
aeson >= 1.2.3.0 && < 1.5
84-
, base-compat >= 0.9.3 && < 0.11
85-
, attoparsec >= 0.13.2.0 && < 0.14
83+
base-compat >= 0.10.1 && < 0.11
8684
, base64-bytestring >= 1.0.0.1 && < 1.1
87-
, exceptions >= 0.8.3 && < 0.11
88-
, http-api-data >= 0.3.7.1 && < 0.4
89-
, http-media >= 0.7.1.1 && < 0.8
90-
, http-types >= 0.12 && < 0.13
85+
, exceptions >= 0.10.0 && < 0.11
86+
, http-api-data >= 0.3.8.1 && < 0.4
87+
, http-media >= 0.7.1.2 && < 0.8
88+
, http-types >= 0.12.1 && < 0.13
9189
, network-uri >= 2.6.1.0 && < 2.7
92-
, monad-control >= 1.0.0.4 && < 1.1
93-
, network >= 2.6.3.2 && < 2.8
94-
, safe >= 0.3.15 && < 0.4
95-
, split >= 0.2.3.2 && < 0.3
90+
, monad-control >= 1.0.2.3 && < 1.1
91+
, network >= 2.6.3.5 && < 2.8
9692
, string-conversions >= 0.4.0.1 && < 0.5
97-
, system-filepath >= 0.4 && < 0.5
98-
, resourcet >= 1.1.9 && < 1.3
93+
, resourcet >= 1.1.11 && < 1.3
9994
, tagged >= 0.8.5 && < 0.9
10095
, transformers-base >= 0.4.4 && < 0.5
101-
, transformers-compat >= 0.5.1 && < 0.7
96+
, transformers-compat >= 0.6.2 && < 0.7
10297
, wai >= 3.2.1.1 && < 3.3
10398
, wai-app-static >= 3.1.6.1 && < 3.2
104-
, warp >= 3.2.13 && < 3.3
10599
, word8 >= 0.1.3 && < 0.2
106100

107101
hs-source-dirs: src
@@ -120,11 +114,13 @@ executable greet
120114
base
121115
, servant
122116
, servant-server
123-
, aeson
124-
, warp
125117
, wai
126118
, text
127119

120+
build-depends:
121+
aeson >= 1.3.1.1 && < 1.5
122+
, warp >= 3.2.13 && < 3.3
123+
128124
test-suite spec
129125
type: exitcode-stdio-1.0
130126
ghc-options: -Wall
@@ -148,13 +144,10 @@ test-suite spec
148144
build-depends:
149145
base
150146
, base-compat
151-
, aeson
152147
, base64-bytestring
153148
, bytestring
154-
, exceptions
155149
, http-types
156150
, mtl
157-
, network
158151
, resourcet
159152
, safe
160153
, servant
@@ -164,27 +157,26 @@ test-suite spec
164157
, transformers
165158
, transformers-compat
166159
, wai
167-
, warp
168160

169161
-- Additonal dependencies
170162
build-depends:
171-
directory >= 1.2.1.0 && < 1.4
172-
, hspec >= 2.4.4 && < 2.6
173-
, hspec-wai >= 0.9 && < 0.10
163+
aeson >= 1.3.1.1 && < 1.5
164+
, directory >= 1.2.1.0 && < 1.4
165+
, hspec >= 2.5.1 && < 2.6
166+
, hspec-wai >= 0.9.0 && < 0.10
167+
, QuickCheck >= 2.11.3 && < 2.12
174168
, should-not-typecheck >= 2.1.0 && < 2.2
175-
, parsec >= 3.1.11 && < 3.2
176-
, QuickCheck >= 2.10.1 && < 2.12
169+
, temporary >= 1.3 && < 1.4
177170
, wai-extra >= 3.0.21.0 && < 3.1
178-
, temporary >= 1.2.0.3 && < 1.4
179171

180172
build-tool-depends:
181-
hspec-discover:hspec-discover >=2.4.4 && <2.6
173+
hspec-discover:hspec-discover >= 2.5.1 && <2.6
182174

183175
test-suite doctests
184176
build-depends:
185177
base
186178
, servant-server
187-
, doctest >= 0.13.0 && <0.16
179+
, doctest >= 0.15.0 && <0.16
188180
type: exitcode-stdio-1.0
189181
main-is: test/doctests.hs
190182
buildable: True

servant/servant.cabal

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ custom-setup
3434
setup-depends:
3535
base >= 4 && <5,
3636
Cabal,
37-
cabal-doctest >= 1.0.2 && <1.1
37+
cabal-doctest >= 1.0.6 && <1.1
3838

3939
library
4040
exposed-modules:
@@ -77,25 +77,25 @@ library
7777

7878
if !impl(ghc >= 8.0)
7979
build-depends:
80-
semigroups >= 0.18.3 && < 0.19
80+
semigroups >= 0.18.4 && < 0.19
8181

8282
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8383
-- Here can be exceptions if we really need features from the newer versions.
8484
build-depends:
85-
base-compat >= 0.9.3 && < 0.11
86-
, aeson >= 1.2.3.0 && < 1.5
87-
, attoparsec >= 0.13.2.0 && < 0.14
85+
base-compat >= 0.10.1 && < 0.11
86+
, aeson >= 1.3.1.1 && < 1.5
87+
, attoparsec >= 0.13.2.2 && < 0.14
8888
, case-insensitive >= 1.2.0.10 && < 1.3
89-
, http-api-data >= 0.3.7.1 && < 0.4
90-
, http-media >= 0.7.1.1 && < 0.8
91-
, http-types >= 0.12 && < 0.13
89+
, http-api-data >= 0.3.8.1 && < 0.4
90+
, http-media >= 0.7.1.2 && < 0.8
91+
, http-types >= 0.12.1 && < 0.13
9292
, natural-transformation >= 0.4 && < 0.5
93-
, mmorph >= 1.1.0 && < 1.2
93+
, mmorph >= 1.1.2 && < 1.2
9494
, tagged >= 0.8.5 && < 0.9
95-
, singleton-bool >= 0.1.2.0 && < 0.2
95+
, singleton-bool >= 0.1.4 && < 0.2
9696
, string-conversions >= 0.4.0.1 && < 0.5
9797
, network-uri >= 2.6.1.0 && < 2.7
98-
, vault >= 0.3.0.7 && < 0.4
98+
, vault >= 0.3.1.1 && < 0.4
9999

100100
hs-source-dirs: src
101101
default-language: Haskell2010
@@ -141,7 +141,6 @@ test-suite spec
141141
base
142142
, base-compat
143143
, aeson
144-
, attoparsec
145144
, bytestring
146145
, servant
147146
, string-conversions
@@ -153,23 +152,23 @@ test-suite spec
153152

154153
-- Additonal dependencies
155154
build-depends:
156-
aeson-compat >= 0.3.3 && < 0.4
157-
, hspec >= 2.4.4 && < 2.6
158-
, QuickCheck >= 2.10.1 && < 2.12
159-
, quickcheck-instances >= 0.3.16 && < 0.4
155+
aeson-compat >= 0.3.7.1 && < 0.4
156+
, hspec >= 2.5.1 && < 2.6
157+
, QuickCheck >= 2.11.3 && < 2.12
158+
, quickcheck-instances >= 0.3.18 && < 0.4
160159

161160
build-tool-depends:
162-
hspec-discover:hspec-discover >= 2.4.4 && < 2.6
161+
hspec-discover:hspec-discover >= 2.5.1 && < 2.6
163162

164163
test-suite doctests
165164
build-depends:
166165
base
167166
, servant
168-
, doctest >= 0.13.0 && <0.16
167+
, doctest >= 0.15.0 && <0.16
169168

170169
-- We test Links failure with doctest, so we need extra dependencies
171170
build-depends:
172-
hspec >= 2.4.4 && < 2.6
171+
hspec >= 2.5.1 && < 2.6
173172

174173
type: exitcode-stdio-1.0
175174
main-is: test/doctests.hs

stack.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Let's try to keep resolver at the first day of the month
2-
resolver: nightly-2018-03-01
2+
resolver: nightly-2018-06-01
33
packages:
44
- servant-client/
55
- servant-client-core/
@@ -8,18 +8,5 @@ packages:
88
- servant-server/
99
- servant/
1010

11-
extra-deps:
12-
- cabal-doctest-1.0.6
13-
- http-api-data-0.3.7.2
14-
- http-types-0.12
15-
- text-1.2.3.0
16-
- aeson-1.3.0.0
17-
- exceptions-0.10.0
18-
- aeson-compat-0.3.7.1
19-
- free-5.0.1
20-
- lens-4.16
21-
- random-bytestring-0.1.3
22-
- pcg-random-0.1.3.5
23-
2411
# allow-newer: true # ignores all bounds, that's a sledgehammer
2512
# - doc/tutorial/

0 commit comments

Comments
 (0)