master...2362a68 · typeable/servant

git.iko.soy/typeable/servant

on 2362a68 help sign in

.travis.yml+3−3

since splitsnapshots

unifiedsplit

@@ -13,7 +13,7 @@ git:

13branches:

14 only:

15 - master

16− - release-0.12

16+ - release-0.14

18cache:

19 directories:

@@ -74,7 +74,7 @@ install:

74 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

75 - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/https\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"

76 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"

77− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"

77+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base, servant-js:servant,servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"

78 - cat cabal.project

79 - if [ -f "servant/configure.ac" ]; then

80 (cd "servant" && autoreconf -i);

@@ -148,7 +148,7 @@ script:

148 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

149 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-https-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"

150 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"

151− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"

151+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base, servant-js:servant,servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"

152 - cat cabal.project

153 - echo -en 'travis_fold:end:unpack\\r'

154

cabal.make-travis-yml+1−1

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

1folds: all-but-test

2−branches: master release-0.12

2+branches: master release-0.14

4-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step

5install-dependencies-step: False

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

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

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

125 , network >= 2.6.3.2 && < 2.8

126 , QuickCheck >= 2.10.1 && < 2.12

127− , servant == 0.13.*

127+ , servant == 0.14.*

128− , servant-server == 0.13.*

128+ , servant-server == 0.14.*

129

130 build-tool-depends:

131 hspec-discover:hspec-discover >= 2.4.4 && < 2.6

servant/CHANGELOG.md+12−3

@@ -37,9 +37,18 @@

37- *servant-client* Add `hoistClient` to `HasClient`.

38 Just like `hoistServer` allows us to change the monad in which request handlers

39 of a web application live in, we also have `hoistClient` for changing the monad

40− in which *client functions* live. Read [tutorial section for more information](#link).

40+ in which *client functions* live.

41+ Read [tutorial section for more information](https://haskell-servant.readthedocs.io/en/release-0.14/tutorial/Client.html#changing-the-monad-the-client-functions-live-in).

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

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

44+ iF you have own combinators, you'll need to define a new method of

45+ `HasClient` class, for example:

46+

47+ ```haskell

48+ type Client m (MyCombinator :> api) = MyValue :> Client m api

49+ hoistClientMonad pm _ nt cl = hoistClientMonad pm (Proxy :: Proxy api) nt . cl

50+ ```

51+

43- *servant* Add `safeLink' :: (Link -> a) -> ... -> MkLink endpoint a`,

52- *servant* Add `safeLink' :: (Link -> a) -> ... -> MkLink endpoint a`,

44 which allows to create helpers returning something else than `Link`.

53 which allows to create helpers returning something else than `Link`.

45 ([#968](https://github.com/haskell-servant/servant/pull/968))

54 ([#968](https://github.com/haskell-servant/servant/pull/968))

@@ -76,10 +85,10 @@

76- Added tests or enabled tests

85- Added tests or enabled tests

77 ([#975](https://github.com/haskell-servant/servant/pull/975))

86 ([#975](https://github.com/haskell-servant/servant/pull/975))

79−- Add [pagination cookbook recipe](#link)

88+- Add [pagination cookbook recipe](https://haskell-servant.readthedocs.io/en/release-0.14/cookbook/pagination/Pagination.html)

80 ([#946](https://github.com/haskell-servant/servant/pull/946))

89 ([#946](https://github.com/haskell-servant/servant/pull/946))

82−- Add [`servant-flatten` cookbook recipe](#link)

91+- Add [`servant-flatten` "spice" to the structuring api recipe](https://haskell-servant.readthedocs.io/en/release-0.14/cookbook/structuring-apis/StructuringApis.html)

83 ([#929](https://github.com/haskell-servant/servant/pull/929))

92 ([#929](https://github.com/haskell-servant/servant/pull/929))

85- Dependency updates

94- Dependency updates