680820c · servant · git.iko.soy

servant-client-core/CHANGELOG.md+5

compare with master

unifiedsplit

@@ -8,6 +8,11 @@

8 changing the monad in which client functions run.

9 ([#936](https://github.com/haskell-servant/servant/pull/936))

10

11+0.13.0.1

12+--------

13+

14+- Support `base-compat-0.10`

15+

110.13

160.13

12----

17----

13

18

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

@@ -64,7 +64,7 @@ library

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

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

66 build-depends:

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

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

68 , base64-bytestring >= 1.0.0.1 && < 1.1

69 , exceptions >= 0.8.3 && < 0.11

70 , free >= 5.0.1 && < 5.1

@@ -98,8 +98,8 @@ test-suite spec

98 -- Additonal dependencies

99 build-depends:

100 deepseq >= 1.3.0.2 && <1.5

101− , hspec >= 2.4.4 && <2.5

101+ , hspec >= 2.4.4 && <2.6

102 , QuickCheck >= 2.10.1 && < 2.12

103

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

22import Data.Foldable (toList)

23import qualified Data.ByteString.Lazy as BL

24import Data.List (foldl')

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

26import Data.Proxy (Proxy (Proxy))

25import Data.Proxy (Proxy (Proxy))

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

27import Data.Sequence (fromList)

28import Data.String (fromString)

29import Data.Text (Text, pack)

servant-client/CHANGELOG.md+5

@@ -8,6 +8,11 @@

8 client functions run.

9 ([#936](https://github.com/haskell-servant/servant/pull/936))

10

11+0.13.0.1

12+--------

13+

14+- Support `base-compat-0.10`

15+

110.13

160.13

12----

17----

13

18

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

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

1name: servant-client

2−version: 0.13

2+version: 0.13.0.1

3synopsis: automatical derivation of querying functions for servant webservices

4description:

5 This library lets you derive automatically Haskell functions that

@@ -60,7 +60,7 @@ library

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

61 build-depends:

62 aeson >= 1.2.3.0 && < 1.4

63− , base-compat >= 0.9.3 && < 0.10

63+ , base-compat >= 0.9.3 && < 0.11

64 , attoparsec >= 0.13.2.0 && < 0.14

65 , http-client >= 0.5.7.1 && < 0.6

66 , http-client-tls >= 0.3.5.1 && < 0.4

@@ -71,7 +71,7 @@ library

71 , semigroupoids >= 5.2.1 && < 5.3

72 , stm >= 2.4.4.1 && < 2.5

73 , transformers-base >= 0.4.4 && < 0.5

74− , transformers-compat >= 0.5.1 && < 0.6

74+ , transformers-compat >= 0.5.1 && < 0.7

75

76 hs-source-dirs: src

77 default-language: Haskell2010

@@ -110,11 +110,15 @@ test-suite spec

110 , wai

111 , warp

112

113+ if !impl(ghc >= 8.0)

114+ build-depends:

115+ semigroups

116+

113 -- Additonal dependencies

117 -- Additonal dependencies

114 build-depends:

118 build-depends:

115 deepseq >= 1.3.0.2 && < 1.5

119 deepseq >= 1.3.0.2 && < 1.5

116 , generics-sop >= 0.3.1.0 && < 0.4

120 , generics-sop >= 0.3.1.0 && < 0.4

117− , hspec >= 2.4.4 && < 2.5

121+ , hspec >= 2.4.4 && < 2.6

118 , HUnit >= 1.6 && < 1.7

122 , HUnit >= 1.6 && < 1.7

119 , random-bytestring >= 0.1 && < 0.2

123 , random-bytestring >= 0.1 && < 0.2

120 , network >= 2.6.3.2 && < 2.7

124 , network >= 2.6.3.2 && < 2.7

@@ -123,4 +127,4 @@ test-suite spec

123 , servant-server == 0.13.*

127 , servant-server == 0.13.*

124

128

125 build-tool-depends:

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

37import Data.Aeson

38import Data.Char (chr, isPrint)

39import Data.Foldable (forM_)

40−import Data.Monoid hiding (getLast)

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

41+import Data.Monoid ()

41import Data.Proxy

42import Data.Proxy

42import qualified Generics.SOP as SOP

43import qualified Generics.SOP as SOP

43import GHC.Generics (Generic)

44import GHC.Generics (Generic)

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

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

1name: servant-docs

2version: 0.11.2

3+x-revision: 2

3synopsis: generate API docs for your servant webservice

4synopsis: generate API docs for your servant webservice

4description:

5description:

5 Library for generating API docs from a servant API definition.

6 Library for generating API docs from a servant API definition.

@@ -58,7 +59,7 @@ library

58 build-depends:

59 build-depends:

59 aeson >= 1.2.3.0 && < 1.4

60 aeson >= 1.2.3.0 && < 1.4

60 , aeson-pretty >= 0.8.5 && < 0.9

61 , aeson-pretty >= 0.8.5 && < 0.9

61− , base-compat >= 0.9.3 && < 0.10

62+ , base-compat >= 0.9.3 && < 0.11

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

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

63 , control-monad-omega >= 0.3.1 && < 0.4

64 , control-monad-omega >= 0.3.1 && < 0.4

64 , hashable >= 1.2.6.1 && < 1.3

65 , hashable >= 1.2.6.1 && < 1.3

@@ -108,7 +109,7 @@ test-suite spec

108

109

109 -- Additonal dependencies

110 -- Additonal dependencies

110 build-depends:

111 build-depends:

111− hspec >= 2.4.4 && < 2.5

112+ hspec >= 2.4.4 && < 2.6

112

113

113 build-tool-depends:

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

1name: servant-foreign

2−version: 0.11

2+version: 0.11.1

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

4description:

5 Helper types and functions for generating client functions for servant APIs in any programming language

@@ -52,7 +52,7 @@ library

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

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

54 build-depends:

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

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

56 , lens >= 4.15.4 && <4.17

57 , http-types >= 0.12 && < 0.13

58

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

79

80 -- Additonal dependencies

81 build-depends:

82− hspec >= 2.4.4 && <2.5

82+ hspec >= 2.4.4 && <2.6

83

84 build-tool-depends:

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

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

86 default-language: Haskell2010

servant-server/CHANGELOG.md+5

@@ -1,6 +1,11 @@

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

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

3

4+0.13.0.1

5+--------

6+

7+- Support `base-compat-0.10`

8+

40.13

90.13

5----

10----

6

11

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

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

1name: servant-server

2−version: 0.13

2+version: 0.13.0.1

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

4description:

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

@@ -68,6 +68,10 @@ library

68 , transformers >= 0.3.0.0 && < 0.6

69 , filepath >= 1.3.0.2 && < 1.5

70

71+ if !impl(ghc >= 8.0)

72+ build-depends:

73+ semigroups >= 0.18.3 && < 0.19

74+

71 -- Servant dependencies

75 -- Servant dependencies

72 build-depends:

76 build-depends:

73 servant == 0.13.*

77 servant == 0.13.*

@@ -76,7 +80,7 @@ library

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

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

77 build-depends:

81 build-depends:

78 aeson >= 1.2.3.0 && < 1.4

82 aeson >= 1.2.3.0 && < 1.4

79− , base-compat >= 0.9.3 && < 0.10

83+ , base-compat >= 0.9.3 && < 0.11

80 , attoparsec >= 0.13.2.0 && < 0.14

84 , attoparsec >= 0.13.2.0 && < 0.14

81 , base64-bytestring >= 1.0.0.1 && < 1.1

85 , base64-bytestring >= 1.0.0.1 && < 1.1

82 , exceptions >= 0.8.3 && < 0.11

86 , exceptions >= 0.8.3 && < 0.11

@@ -93,7 +97,7 @@ library

93 , resourcet >= 1.1.9 && < 1.3

97 , resourcet >= 1.1.9 && < 1.3

94 , tagged >= 0.8.5 && < 0.9

98 , tagged >= 0.8.5 && < 0.9

95 , transformers-base >= 0.4.4 && < 0.5

99 , transformers-base >= 0.4.4 && < 0.5

96− , transformers-compat >= 0.5.1 && < 0.6

100+ , transformers-compat >= 0.5.1 && < 0.7

97 , wai >= 3.2.1.1 && < 3.3

101 , wai >= 3.2.1.1 && < 3.3

98 , wai-app-static >= 3.1.6.1 && < 3.2

102 , wai-app-static >= 3.1.6.1 && < 3.2

99 , warp >= 3.2.13 && < 3.3

103 , warp >= 3.2.13 && < 3.3

@@ -164,22 +168,22 @@ test-suite spec

164 -- Additonal dependencies

168 -- Additonal dependencies

165 build-depends:

169 build-depends:

166 directory >= 1.2.1.0 && < 1.4

170 directory >= 1.2.1.0 && < 1.4

167− , hspec >= 2.4.4 && < 2.5

171+ , hspec >= 2.4.4 && < 2.6

168 , hspec-wai >= 0.9 && < 0.10

172 , hspec-wai >= 0.9 && < 0.10

169 , should-not-typecheck >= 2.1.0 && < 2.2

173 , should-not-typecheck >= 2.1.0 && < 2.2

170 , parsec >= 3.1.11 && < 3.2

174 , parsec >= 3.1.11 && < 3.2

171 , QuickCheck >= 2.10.1 && < 2.12

175 , QuickCheck >= 2.10.1 && < 2.12

172 , wai-extra >= 3.0.21.0 && < 3.1

176 , wai-extra >= 3.0.21.0 && < 3.1

173− , temporary >= 1.2.0.3 && < 1.3

177+ , temporary >= 1.2.0.3 && < 1.4

174

178

175 build-tool-depends:

179 build-tool-depends:

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

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

177

181

178test-suite doctests

182test-suite doctests

179 build-depends:

183 build-depends:

180 base

184 base

181 , servant-server

185 , servant-server

182− , doctest >= 0.13.0 && <0.14

186+ , doctest >= 0.13.0 && <0.16

183 type: exitcode-stdio-1.0

187 type: exitcode-stdio-1.0

184 main-is: test/doctests.hs

188 main-is: test/doctests.hs

185 buildable: True

189 buildable: True

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

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

44import Data.Maybe (fromMaybe, mapMaybe,

45 isNothing, maybeToList)

46import Data.Either (partitionEithers)

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

47import Data.String (IsString (..))

48import Data.String (IsString (..))

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

49+import Data.String.Conversions (cs)

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

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

50import qualified Data.Text as T

51import qualified Data.Text as T

51import Data.Typeable

52import Data.Typeable

servant/CHANGELOG.md+5

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

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

2

3+0.13.0.1

4+--------

5+

6+- Support `base-compat-0.10`

7+

30.13

80.13

4----

9----

5

10

servant/servant.cabal+7−7

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

1name: servant

2−version: 0.13

2+version: 0.13.0.1

3synopsis: A family of combinators for defining webservices APIs

4description:

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

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

80

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

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

83− build-depends:

83+ build-depends:

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

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

85 , aeson >= 1.2.3.0 && < 1.4

86 , attoparsec >= 0.13.2.0 && < 0.14

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

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

153 -- Additonal dependencies

154 build-depends:

155 aeson-compat >= 0.3.3 && < 0.4

156− , hspec >= 2.4.4 && < 2.5

156+ , hspec >= 2.4.4 && < 2.6

157 , QuickCheck >= 2.10.1 && < 2.12

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

159

160 build-tool-depends:

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

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

162

163test-suite doctests

164 build-depends:

165 base

166 , servant

167− , doctest >= 0.13.0 && <0.14

167+ , doctest >= 0.13.0 && <0.16

168

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

170 build-depends:

171− hspec >= 2.4.4 && < 2.5

171+ hspec >= 2.4.4 && < 2.6

172

173 type: exitcode-stdio-1.0

174 main-is: test/doctests.hs

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

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

101) where

102

103import Data.List

104−import Data.Monoid.Compat

105− ((<>))

106import Data.Proxy

104import Data.Proxy

107 (Proxy (..))

105 (Proxy (..))

106+import Data.Semigroup

107+ ((<>))

108import Data.Singletons.Bool

109 (SBool (..), SBoolI (..))

110import qualified Data.Text as Text

111import qualified Data.Text.Encoding as TE

112+import Data.Type.Bool

113+ (If)

112import Data.Type.Bool

114import Data.Type.Bool

113 (If)

115 (If)

114import GHC.TypeLits

116import GHC.TypeLits