a49b53c · typeable/servant

git.iko.soy/typeable/servant

Merge pull request #941 from phadej/base-compat-0.10

Allow base-compat-0.10.0

commita49b53c675094444d63327bf9888dcf12ffa7c82 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Apr 2018, 09:50 (9 years ago) parent7176917 2214663

13 files changed+43−19

compare with master

unifiedsplit

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

servant-client-core/CHANGELOG.md+6

@@ -1,6 +1,12 @@

11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client-core/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`

4100.13

511----

612

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

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

11name: servant-client-core

2−version: 0.13

3−x-revision: 1

2+version: 0.13.0.1

43synopsis: Core functionality and class for client function generation for servant APIs

54description:

65 This library provides backend-agnostic generation of client functions. For

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

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

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

6665 build-depends:

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

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

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

6968 , exceptions >= 0.8.3 && < 0.11

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

servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+1−1

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

2121import Data.Foldable (toList)

2222import qualified Data.ByteString.Lazy as BL

2323import Data.List (foldl')

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

2524import Data.Proxy (Proxy (Proxy))

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

2626import Data.Sequence (fromList)

2727import Data.String (fromString)

2828import Data.Text (Text, pack)

servant-client/servant-client.cabal+6−2

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

11name: servant-client

22version: 0.13

3−x-revision: 1

3+x-revision: 2

44synopsis: automatical derivation of querying functions for servant webservices

55description:

66 This library lets you derive automatically Haskell functions that

@@ -62,7 +62,7 @@ library

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

6363 build-depends:

6464 aeson >= 1.2.3.0 && < 1.4

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

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

6666 , attoparsec >= 0.13.2.0 && < 0.14

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

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

@@ -112,6 +112,10 @@ test-suite spec

112112 , wai

113113 , warp

114114

115+ if !impl(ghc >= 8.0)

116+ build-depends:

117+ semigroups

118+

115119 -- Additonal dependencies

116120 build-depends:

117121 deepseq >= 1.3.0.2 && < 1.5

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

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

11name: servant-docs

22version: 0.11.2

3−x-revision: 1

3+x-revision: 2

44synopsis: generate API docs for your servant webservice

55description:

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

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

6060 build-depends:

6161 aeson >= 1.2.3.0 && < 1.4

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

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

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

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

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

6666 , hashable >= 1.2.6.1 && < 1.3

servant-foreign/servant-foreign.cabal+2−1

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

11name: servant-foreign

22version: 0.11.1

3+x-revision: 1

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

45description:

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

@@ -57,7 +58,7 @@ library

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

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

5960 build-depends:

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

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

6162 , lens >= 4.15.4 && <4.17

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

6364

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+6−3

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

11name: servant-server

2−version: 0.13

3−x-revision: 1

2+version: 0.13.0.1

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

54description:

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

@@ -70,6 +69,10 @@ library

7069 , transformers >= 0.3.0.0 && < 0.6

7170 , filepath >= 1.3.0.2 && < 1.5

7271

72+ if !impl(ghc >= 8.0)

73+ build-depends:

74+ semigroups >= 0.18.3 && < 0.19

75+

7376 -- Servant dependencies

7477 build-depends:

7578 servant == 0.13.*

@@ -78,7 +81,7 @@ library

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

7982 build-depends:

8083 aeson >= 1.2.3.0 && < 1.4

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

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

8285 , attoparsec >= 0.13.2.0 && < 0.14

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

8487 , exceptions >= 0.8.3 && < 0.11

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

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

11name: servant

2−version: 0.13

3−x-revision: 1

2+version: 0.13.0.1

43synopsis: A family of combinators for defining webservices APIs

54description:

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

@@ -82,8 +81,8 @@ library

8281

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

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

85− build-depends:

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

84+ build-depends:

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

8786 , aeson >= 1.2.3.0 && < 1.4

8887 , attoparsec >= 0.13.2.0 && < 0.14

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

servant/src/Servant/Utils/Links.hs+1−1

@@ -101,7 +101,7 @@ module Servant.Utils.Links (

101101) where

102102

103103import Data.List

104−import Data.Monoid.Compat ( (<>) )

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

105105import Data.Proxy ( Proxy(..) )

106106import Data.Singletons.Bool ( SBool (..), SBoolI (..) )

107107import qualified Data.Text as Text