680820c · servant · git.iko.soy

git.iko.soy/servant

Merge pull request #943 from phadej/bounds-backports

Bounds backports

commit680820c98c71c169c22b467fd7d61c01944cde2d authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Apr 2018, 12:12 (9 years ago) parent6be8291 7d4293f

14 files changed+67−34

compare with master

unifiedsplit

servant-client-core/CHANGELOG.md+5 servant-client-core/servant-client-core.cabal+3−3 servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+1−1 servant-client/CHANGELOG.md+5 servant-client/servant-client.cabal+9−5 servant-client/test/Servant/ClientSpec.hs+2−1 servant-docs/servant-docs.cabal+4−3 servant-foreign/servant-foreign.cabal+4−4 servant-server/CHANGELOG.md+5 servant-server/servant-server.cabal+11−7 servant-server/src/Servant/Server/Internal.hs+2−1 servant/CHANGELOG.md+5 servant/servant.cabal+7−7 servant/src/Servant/Utils/Links.hs+4−2

servant-client-core/CHANGELOG.md+5

@@ -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+

11160.13

1217----

1318

servant-client-core/servant-client-core.cabal+3−3

@@ -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+1−1

@@ -22,8 +22,8 @@ import Control.Concurrent (newMVar, modifyMVar)

2222import Data.Foldable (toList)

2323import qualified Data.ByteString.Lazy as BL

2424import Data.List (foldl')

25−import Data.Monoid ((<>))

2625import Data.Proxy (Proxy (Proxy))

26+import Data.Semigroup ((<>))

2727import Data.Sequence (fromList)

2828import Data.String (fromString)

2929import Data.Text (Text, pack)

servant-client/CHANGELOG.md+5

@@ -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+

11160.13

1217----

1318

servant-client/servant-client.cabal+9−5

@@ -1,5 +1,5 @@

11name: servant-client

2−version: 0.13

2+version: 0.13.0.1

33synopsis: automatical derivation of querying functions for servant webservices

44description:

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+2−1

@@ -37,7 +37,8 @@ import Control.Monad.Error.Class (throwError)

3737import Data.Aeson

3838import Data.Char (chr, isPrint)

3939import Data.Foldable (forM_)

40−import Data.Monoid hiding (getLast)

40+import Data.Semigroup ((<>))

41+import Data.Monoid ()

4142import Data.Proxy

4243import qualified Generics.SOP as SOP

4344import GHC.Generics (Generic)

servant-docs/servant-docs.cabal+4−3

@@ -1,5 +1,6 @@

11name: servant-docs

22version: 0.11.2

3+x-revision: 2

34synopsis: generate API docs for your servant webservice

45description:

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+4−4

@@ -1,5 +1,5 @@

11name: servant-foreign

2−version: 0.11

2+version: 0.11.1

33synopsis: Helpers for generating clients for servant APIs in any programming language

44description:

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+5

@@ -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)

4+0.13.0.1

5+--------

7+- Support `base-compat-0.10`

490.13

510----

611

servant-server/servant-server.cabal+11−7

@@ -1,5 +1,5 @@

11name: servant-server

2−version: 0.13

2+version: 0.13.0.1

33synopsis: A family of combinators for defining webservices APIs and serving them

44description:

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

178182test-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

servant-server/src/Servant/Server/Internal.hs+2−1

@@ -44,8 +44,9 @@ import qualified Data.ByteString.Lazy as BL

4444import Data.Maybe (fromMaybe, mapMaybe,

4545 isNothing, maybeToList)

4646import Data.Either (partitionEithers)

47+import Data.Semigroup ((<>))

4748import Data.String (IsString (..))

48−import Data.String.Conversions (cs, (<>))

49+import Data.String.Conversions (cs)

4950import Data.Tagged (Tagged(..), retag, untag)

5051import qualified Data.Text as T

5152import Data.Typeable

servant/CHANGELOG.md+5

@@ -1,5 +1,10 @@

11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

3+0.13.0.1

4+--------

6+- Support `base-compat-0.10`

380.13

49----

510

servant/servant.cabal+7−7

@@ -1,5 +1,5 @@

11name: servant

2−version: 0.13

2+version: 0.13.0.1

33synopsis: A family of combinators for defining webservices APIs

44description:

55 A family of combinators for defining webservices APIs and serving them

@@ -80,8 +80,8 @@ library

8080

8181 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

8282 -- Here can be exceptions if we really need features from the newer versions.

83− build-depends:

84− base-compat >= 0.9.3 && < 0.10

83+ build-depends:

84+ base-compat >= 0.9.3 && < 0.11

8585 , aeson >= 1.2.3.0 && < 1.4

8686 , attoparsec >= 0.13.2.0 && < 0.14

8787 , case-insensitive >= 1.2.0.10 && < 1.3

@@ -153,22 +153,22 @@ test-suite spec

153153 -- Additonal dependencies

154154 build-depends:

155155 aeson-compat >= 0.3.3 && < 0.4

156− , hspec >= 2.4.4 && < 2.5

156+ , hspec >= 2.4.4 && < 2.6

157157 , QuickCheck >= 2.10.1 && < 2.12

158158 , quickcheck-instances >= 0.3.16 && < 0.4

159159

160160 build-tool-depends:

161− hspec-discover:hspec-discover >= 2.4.4 && < 2.5

161+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6

162162

163163test-suite doctests

164164 build-depends:

165165 base

166166 , servant

167− , doctest >= 0.13.0 && <0.14

167+ , doctest >= 0.13.0 && <0.16

168168

169169 -- We test Links failure with doctest, so we need extra dependencies

170170 build-depends:

171− hspec >= 2.4.4 && < 2.5

171+ hspec >= 2.4.4 && < 2.6

172172

173173 type: exitcode-stdio-1.0

174174 main-is: test/doctests.hs

servant/src/Servant/Utils/Links.hs+4−2

@@ -101,14 +101,16 @@ module Servant.Utils.Links (

101101) where

102102

103103import Data.List

104−import Data.Monoid.Compat

105− ((<>))

106104import Data.Proxy

107105 (Proxy (..))

106+import Data.Semigroup

107+ ((<>))

108108import Data.Singletons.Bool

109109 (SBool (..), SBoolI (..))

110110import qualified Data.Text as Text

111111import qualified Data.Text.Encoding as TE

112+import Data.Type.Bool

113+ (If)

112114import Data.Type.Bool

113115 (If)

114116import GHC.TypeLits