Skip to content

Commit 680820c

Browse files
phadejphadej
authored
Merge pull request #943 from phadej/bounds-backports
Bounds backports
2 parents 6be8291 + 7d4293f commit 680820c

File tree

14 files changed

+67
-34
lines changed

14 files changed

+67
-34
lines changed

‎servant-client-core/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
changing the monad in which client functions run.
99
([#936](https://github.com/haskell-servant/servant/pull/936))
1010

11+
0.13.0.1
12+
--------
13+
14+
- Support `base-compat-0.10`
15+
1116
0.13
1217
----
1318

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ library
6464
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6565
-- Here can be exceptions if we really need features from the newer versions.
6666
build-depends:
67-
base-compat >= 0.9.3 && < 0.10
67+
base-compat >= 0.9.3 && < 0.11
6868
, base64-bytestring >= 1.0.0.1 && < 1.1
6969
, exceptions >= 0.8.3 && < 0.11
7070
, free >= 5.0.1 && < 5.1
@@ -98,8 +98,8 @@ test-suite spec
9898
-- Additonal dependencies
9999
build-depends:
100100
deepseq >= 1.3.0.2 && <1.5
101-
, hspec >= 2.4.4 && <2.5
101+
, hspec >= 2.4.4 && <2.6
102102
, QuickCheck >= 2.10.1 && < 2.12
103103

104104
build-tool-depends:
105-
hspec-discover:hspec-discover >= 2.4.4 && <2.5
105+
hspec-discover:hspec-discover >= 2.4.4 && <2.6

‎servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import Control.Concurrent (newMVar, modifyMVar)
2222
import Data.Foldable (toList)
2323
import qualified Data.ByteString.Lazy as BL
2424
import Data.List (foldl')
25-
import Data.Monoid ((<>))
2625
import Data.Proxy (Proxy (Proxy))
26+
import Data.Semigroup ((<>))
2727
import Data.Sequence (fromList)
2828
import Data.String (fromString)
2929
import Data.Text (Text, pack)

‎servant-client/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
client functions run.
99
([#936](https://github.com/haskell-servant/servant/pull/936))
1010

11+
0.13.0.1
12+
--------
13+
14+
- Support `base-compat-0.10`
15+
1116
0.13
1217
----
1318

‎servant-client/servant-client.cabal

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: servant-client
2-
version: 0.13
2+
version: 0.13.0.1
33
synopsis: automatical derivation of querying functions for servant webservices
44
description:
55
This library lets you derive automatically Haskell functions that
@@ -60,7 +60,7 @@ library
6060
-- Here can be exceptions if we really need features from the newer versions.
6161
build-depends:
6262
aeson >= 1.2.3.0 && < 1.4
63-
, base-compat >= 0.9.3 && < 0.10
63+
, base-compat >= 0.9.3 && < 0.11
6464
, attoparsec >= 0.13.2.0 && < 0.14
6565
, http-client >= 0.5.7.1 && < 0.6
6666
, http-client-tls >= 0.3.5.1 && < 0.4
@@ -71,7 +71,7 @@ library
7171
, semigroupoids >= 5.2.1 && < 5.3
7272
, stm >= 2.4.4.1 && < 2.5
7373
, transformers-base >= 0.4.4 && < 0.5
74-
, transformers-compat >= 0.5.1 && < 0.6
74+
, transformers-compat >= 0.5.1 && < 0.7
7575

7676
hs-source-dirs: src
7777
default-language: Haskell2010
@@ -110,11 +110,15 @@ test-suite spec
110110
, wai
111111
, warp
112112

113+
if !impl(ghc >= 8.0)
114+
build-depends:
115+
semigroups
116+
113117
-- Additonal dependencies
114118
build-depends:
115119
deepseq >= 1.3.0.2 && < 1.5
116120
, generics-sop >= 0.3.1.0 && < 0.4
117-
, hspec >= 2.4.4 && < 2.5
121+
, hspec >= 2.4.4 && < 2.6
118122
, HUnit >= 1.6 && < 1.7
119123
, random-bytestring >= 0.1 && < 0.2
120124
, network >= 2.6.3.2 && < 2.7
@@ -123,4 +127,4 @@ test-suite spec
123127
, servant-server == 0.13.*
124128

125129
build-tool-depends:
126-
hspec-discover:hspec-discover >= 2.4.4 && < 2.5
130+
hspec-discover:hspec-discover >= 2.4.4 && < 2.6

‎servant-client/test/Servant/ClientSpec.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ import Control.Monad.Error.Class (throwError)
3737
import Data.Aeson
3838
import Data.Char (chr, isPrint)
3939
import Data.Foldable (forM_)
40-
import Data.Monoid hiding (getLast)
40+
import Data.Semigroup ((<>))
41+
import Data.Monoid ()
4142
import Data.Proxy
4243
import qualified Generics.SOP as SOP
4344
import GHC.Generics (Generic)

‎servant-docs/servant-docs.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: servant-docs
22
version: 0.11.2
3+
x-revision: 2
34
synopsis: generate API docs for your servant webservice
45
description:
56
Library for generating API docs from a servant API definition.
@@ -58,7 +59,7 @@ library
5859
build-depends:
5960
aeson >= 1.2.3.0 && < 1.4
6061
, aeson-pretty >= 0.8.5 && < 0.9
61-
, base-compat >= 0.9.3 && < 0.10
62+
, base-compat >= 0.9.3 && < 0.11
6263
, case-insensitive >= 1.2.0.10 && < 1.3
6364
, control-monad-omega >= 0.3.1 && < 0.4
6465
, hashable >= 1.2.6.1 && < 1.3
@@ -108,7 +109,7 @@ test-suite spec
108109

109110
-- Additonal dependencies
110111
build-depends:
111-
hspec >= 2.4.4 && < 2.5
112+
hspec >= 2.4.4 && < 2.6
112113

113114
build-tool-depends:
114-
hspec-discover:hspec-discover >=2.4.4 && <2.5
115+
hspec-discover:hspec-discover >=2.4.4 && <2.6

‎servant-foreign/servant-foreign.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: servant-foreign
2-
version: 0.11
2+
version: 0.11.1
33
synopsis: Helpers for generating clients for servant APIs in any programming language
44
description:
55
Helper types and functions for generating client functions for servant APIs in any programming language
@@ -52,7 +52,7 @@ library
5252
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5353
-- Here can be exceptions if we really need features from the newer versions.
5454
build-depends:
55-
base-compat >= 0.9.3 && <0.10
55+
base-compat >= 0.9.3 && <0.11
5656
, lens >= 4.15.4 && <4.17
5757
, http-types >= 0.12 && < 0.13
5858

@@ -79,8 +79,8 @@ test-suite spec
7979

8080
-- Additonal dependencies
8181
build-depends:
82-
hspec >= 2.4.4 && <2.5
82+
hspec >= 2.4.4 && <2.6
8383

8484
build-tool-depends:
85-
hspec-discover:hspec-discover >=2.4.4 && <2.5
85+
hspec-discover:hspec-discover >=2.4.4 && <2.6
8686
default-language: Haskell2010

‎servant-server/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md)
22
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33

4+
0.13.0.1
5+
--------
6+
7+
- Support `base-compat-0.10`
8+
49
0.13
510
----
611

‎servant-server/servant-server.cabal

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: servant-server
2-
version: 0.13
2+
version: 0.13.0.1
33
synopsis: A family of combinators for defining webservices APIs and serving them
44
description:
55
A family of combinators for defining webservices APIs and serving them
@@ -68,6 +68,10 @@ library
6868
, transformers >= 0.3.0.0 && < 0.6
6969
, filepath >= 1.3.0.2 && < 1.5
7070

71+
if !impl(ghc >= 8.0)
72+
build-depends:
73+
semigroups >= 0.18.3 && < 0.19
74+
7175
-- Servant dependencies
7276
build-depends:
7377
servant == 0.13.*
@@ -76,7 +80,7 @@ library
7680
-- Here can be exceptions if we really need features from the newer versions.
7781
build-depends:
7882
aeson >= 1.2.3.0 && < 1.4
79-
, base-compat >= 0.9.3 && < 0.10
83+
, base-compat >= 0.9.3 && < 0.11
8084
, attoparsec >= 0.13.2.0 && < 0.14
8185
, base64-bytestring >= 1.0.0.1 && < 1.1
8286
, exceptions >= 0.8.3 && < 0.11
@@ -93,7 +97,7 @@ library
9397
, resourcet >= 1.1.9 && < 1.3
9498
, tagged >= 0.8.5 && < 0.9
9599
, transformers-base >= 0.4.4 && < 0.5
96-
, transformers-compat >= 0.5.1 && < 0.6
100+
, transformers-compat >= 0.5.1 && < 0.7
97101
, wai >= 3.2.1.1 && < 3.3
98102
, wai-app-static >= 3.1.6.1 && < 3.2
99103
, warp >= 3.2.13 && < 3.3
@@ -164,22 +168,22 @@ test-suite spec
164168
-- Additonal dependencies
165169
build-depends:
166170
directory >= 1.2.1.0 && < 1.4
167-
, hspec >= 2.4.4 && < 2.5
171+
, hspec >= 2.4.4 && < 2.6
168172
, hspec-wai >= 0.9 && < 0.10
169173
, should-not-typecheck >= 2.1.0 && < 2.2
170174
, parsec >= 3.1.11 && < 3.2
171175
, QuickCheck >= 2.10.1 && < 2.12
172176
, wai-extra >= 3.0.21.0 && < 3.1
173-
, temporary >= 1.2.0.3 && < 1.3
177+
, temporary >= 1.2.0.3 && < 1.4
174178

175179
build-tool-depends:
176-
hspec-discover:hspec-discover >=2.4.4 && <2.5
180+
hspec-discover:hspec-discover >=2.4.4 && <2.6
177181

178182
test-suite doctests
179183
build-depends:
180184
base
181185
, servant-server
182-
, doctest >= 0.13.0 && <0.14
186+
, doctest >= 0.13.0 && <0.16
183187
type: exitcode-stdio-1.0
184188
main-is: test/doctests.hs
185189
buildable: True

0 commit comments

Comments
 (0)