Skip to content

Commit bbe57a3

Browse files
committed
Allow base-compat-0.14
1 parent 2af8e96 commit bbe57a3

File tree

9 files changed

+14
-9
lines changed

9 files changed

+14
-9
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ library
117117
-- Here can be exceptions if we really need features from the newer versions.
118118
build-depends:
119119
, aeson >=1.4.1.0 && <3
120-
, base-compat >=0.10.5 && <0.14
120+
, base-compat >=0.10.5 && <0.15
121121
, base64-bytestring >=1.0.0.1 && <1.3
122122
, exceptions >=0.10.0 && <0.11
123123
, free >=5.1 && <5.3

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# OPTIONS_GHC -Wno-missing-methods #-}
23
module Servant.Client.Core.HasClient (
34
clientIn,
@@ -25,8 +26,10 @@ import Data.Foldable
2526
(toList)
2627
import Data.Kind
2728
(Type)
29+
#if !MIN_VERSION_base_compat(0,14,0)
2830
import Data.List
2931
(foldl')
32+
#endif
3033
import Data.Sequence
3134
(fromList)
3235
import qualified Data.Text as T

servant-client/servant-client.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ library
112112
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
113113
-- Here can be exceptions if we really need features from the newer versions.
114114
build-depends:
115-
, base-compat >=0.10.5 && <0.14
115+
, base-compat >=0.10.5 && <0.15
116116
, exceptions >=0.10.0 && <0.11
117117
, http-client >=0.5.13.1 && <0.8
118118
, http-media >=0.7.1.3 && <0.9

servant-client/src/Servant/Client/Internal/HttpClient.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ import qualified Data.ByteString as BS
3333
import Data.ByteString.Builder
3434
(toLazyByteString)
3535
import qualified Data.ByteString.Lazy as BSL
36-
import Data.Foldable
37-
(foldl',toList)
36+
#if !MIN_VERSION_base_compat(0,14,0)
37+
import Data.Foldable (foldl')
38+
#endif
39+
import Data.Foldable (toList)
3840
import Data.Functor.Alt
3941
(Alt (..))
4042
import Data.Maybe

servant-docs/servant-docs.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ library
5454
build-depends:
5555
aeson >= 1.4.1.0 && < 3
5656
, aeson-pretty >= 0.8.5 && < 0.9
57-
, base-compat >= 0.10.5 && < 0.14
57+
, base-compat >= 0.10.5 && < 0.15
5858
, case-insensitive >= 1.2.0.11 && < 1.3
5959
, hashable >= 1.2.7.0 && < 1.5
6060
, http-media >= 0.7.1.3 && < 0.9

servant-foreign/servant-foreign.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ library
5151
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5252
-- Here can be exceptions if we really need features from the newer versions.
5353
build-depends:
54-
base-compat >= 0.10.5 && < 0.14
54+
base-compat >= 0.10.5 && < 0.15
5555
, lens >= 4.17 && < 5.3
5656
, http-types >= 0.12.2 && < 0.13
5757

servant-http-streams/servant-http-streams.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ 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-
base-compat >= 0.10.5 && < 0.14
63+
base-compat >= 0.10.5 && < 0.15
6464
, case-insensitive
6565
, http-streams >= 0.8.6.1 && < 0.9
6666
, http-media >= 0.7.1.3 && < 0.9

servant-quickcheck/servant-quickcheck.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
build-depends:
3838
aeson >=0.8 && <2.3
3939
, base >=4.9 && <4.20
40-
, base-compat-batteries >=0.10.1 && <0.14
40+
, base-compat-batteries >=0.10.1 && <0.15
4141
, bytestring >=0.10 && <0.13
4242
, case-insensitive >=1.2 && <1.3
4343
, clock >=0.7 && <0.9

servant-swagger/servant-swagger.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ library
7272
build-depends: aeson >=1.4.2.0 && <3
7373
, aeson-pretty >=0.8.7 && <0.9
7474
, base >=4.9.1.0 && <5
75-
, base-compat >=0.10.5 && <0.14
75+
, base-compat >=0.10.5 && <0.15
7676
, bytestring >=0.10.8.1 && <0.13
7777
, http-media >=0.7.1.3 && <0.9
7878
, insert-ordered-containers >=0.2.1.0 && <0.3

0 commit comments

Comments
 (0)