From 018f0e082e7058b24d8567295c4a4f3f39f3f6bf Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 6 Nov 2017 10:40:39 +0200 Subject: [PATCH] Bump versions and update changelogs. The changelog for `servant` contains changes across core packages, as we release them as a suite. Also added links to the GitHub master as we might update entries for old versions, as changelogs are written by humans. --- .travis.yml | 4 +++ README.md | 26 +++++++-------- cabal.project | 2 ++ doc/tutorial/tutorial.cabal | 8 ++--- servant-client-core/CHANGELOG.md | 10 +++--- servant-client-core/servant-client-core.cabal | 4 +-- servant-client/CHANGELOG.md | 9 +++++ servant-client/servant-client.cabal | 6 ++-- servant-docs/CHANGELOG.md | 3 ++ servant-docs/servant-docs.cabal | 4 +-- servant-foreign/CHANGELOG.md | 11 +++++++ servant-foreign/servant-foreign.cabal | 4 +-- servant-server/CHANGELOG.md | 5 ++- servant-server/servant-server.cabal | 4 +-- servant/CHANGELOG.md | 33 ++++++++++++++++++- servant/servant.cabal | 2 +- 16 files changed, 100 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03f09fe7..6837b302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,10 @@ script: - cd ${DISTDIR} - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\n' > cabal.project" + + # Allow-newer and other cabal.project amendments + - "echo 'allow-newer: servant-js:servant, servant-js:servant-foreign' >> cabal.project" + - echo -en 'travis_fold:end:unpack\\r' - echo Building... && echo -en 'travis_fold:start:build\\r' # this builds all libraries and executables (without tests/benchmarks) diff --git a/README.md b/README.md index 68d73bd6..eac70422 100644 --- a/README.md +++ b/README.md @@ -21,19 +21,19 @@ list](https://groups.google.com/forum/#!forum/haskell-servant). This table lists the versions of some `servant-` libraries at the point of release of `servant` package. -| | **0.10** | **0.11** | -| ------------------- | -------- |----------- -| servant | 0.10 | 0.11 | -| servant-blaze | 0.7.1 | ? | -| servant-cassava | 0.7 | ? | -| servant-client | 0.10 | 0.11 | -| servant-docs | 0.10 | 0.11 | -| servant-foreign | 0.10 | 0.10.0.1 | -| servant-js | 0.9.1 | ? | -| servant-lucid | 0.7.1 | ? | -| servant-mock | 0.8.1.1 | ? | -| servant-server | 0.10 | 0.11 | -| servant-swagger | 1.1.2.1 | ? | +| | **0.10** | **0.11** | **0.12** | +| ------------------- | -------- |---------------------| +| servant | 0.10 | 0.11 | 0.12 | +| servant-blaze | 0.7.1 | ? | ? | +| servant-cassava | 0.7 | ? | ? | +| servant-client | 0.10 | 0.11 | 0.12 | +| servant-docs | 0.10 | 0.11 | 0.11.1 | +| servant-foreign | 0.10 | 0.10.0.1 | 0.10.2 | +| servant-js | 0.9.1 | ? | ? | +| servant-lucid | 0.7.1 | ? | ? | +| servant-mock | 0.8.1.1 | ? | ? | +| servant-server | 0.10 | 0.11 | 0.12 | +| servant-swagger | 1.1.2.1 | ? | ? | ## Contributing diff --git a/cabal.project b/cabal.project index 9c65df10..8528a525 100644 --- a/cabal.project +++ b/cabal.project @@ -5,3 +5,5 @@ packages: servant/ servant-foreign/ servant-server/ doc/tutorial/ + +allow-newer: servant-js:servant, servant-js:servant-foreign diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index ad886d01..975a5c7c 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -33,10 +33,10 @@ library , directory , blaze-markup , containers - , servant == 0.11.* - , servant-server == 0.11.* - , servant-client == 0.11.* - , servant-docs == 0.11.* + , servant == 0.12.* + , servant-server == 0.12.* + , servant-client == 0.12.* + , servant-docs >= 0.11.1 && <0.12 , servant-js >= 0.9 && <0.10 , warp , http-api-data diff --git a/servant-client-core/CHANGELOG.md b/servant-client-core/CHANGELOG.md index 10b2cd74..ac711738 100644 --- a/servant-client-core/CHANGELOG.md +++ b/servant-client-core/CHANGELOG.md @@ -1,6 +1,8 @@ -# Revision history for servant-client-core +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client-core/CHANGELOG.md) +[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) -## 0.12 -- YYYY-mm-dd +0.12 +---- -* First version. Factored out of servant-client all the functionality that was -independent of the http-client backend. +- First version. Factored out of `servant-client` all the functionality that was + independent of the `http-client` backend. diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index a3baf880..e3650961 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -1,5 +1,5 @@ name: servant-client-core -version: 0.11 +version: 0.12 synopsis: Core functionality and class for client function generation for servant APIs description: This library provides backend-agnostic generation of client functions. For @@ -53,7 +53,7 @@ library , mtl >= 2.1 && < 2.3 , network-uri >= 2.6 && < 2.7 , safe >= 0.3.9 && < 0.4 - , servant == 0.11.* + , servant == 0.12.* , text >= 1.2 && < 1.3 if !impl(ghc >= 8.0) build-depends: diff --git a/servant-client/CHANGELOG.md b/servant-client/CHANGELOG.md index d9a340ff..f91629db 100644 --- a/servant-client/CHANGELOG.md +++ b/servant-client/CHANGELOG.md @@ -1,3 +1,12 @@ +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md) +[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) + +0.12 +---- + +- Factored out into `servant-client-core` all the functionality that was + independent of the `http-client` backend. + 0.11 ---- diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index e2d9d385..79d7667a 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,5 +1,5 @@ name: servant-client -version: 0.11 +version: 0.12 synopsis: automatical derivation of querying functions for servant webservices description: This library lets you derive automatically Haskell functions that @@ -50,7 +50,7 @@ library , monad-control >= 1.0.0.4 && < 1.1 , mtl >= 2.1 && < 2.3 , semigroupoids >= 4.3 && < 5.3 - , servant-client-core == 0.11.* + , servant-client-core == 0.12.* , text >= 1.2 && < 1.3 , transformers >= 0.3 && < 0.6 , transformers-base >= 0.4.4 && < 0.5 @@ -91,7 +91,7 @@ test-suite spec , servant , servant-client , servant-client-core - , servant-server == 0.11.* + , servant-server == 0.12.* , text , transformers , transformers-compat diff --git a/servant-docs/CHANGELOG.md b/servant-docs/CHANGELOG.md index a3209d2b..d7344b6e 100644 --- a/servant-docs/CHANGELOG.md +++ b/servant-docs/CHANGELOG.md @@ -1,3 +1,6 @@ +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-docs/CHANGELOG.md) +[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) + 0.11.1 ------ diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 38d3d6c9..5bf77209 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -1,5 +1,5 @@ name: servant-docs -version: 0.11 +version: 0.11.1 synopsis: generate API docs for your servant webservice description: Library for generating API docs from a servant API definition. @@ -46,7 +46,7 @@ library , http-media >= 0.6 , http-types >= 0.7 , lens - , servant == 0.11.* + , servant == 0.12.* , string-conversions , text , unordered-containers diff --git a/servant-foreign/CHANGELOG.md b/servant-foreign/CHANGELOG.md index d1ab33fb..00e98d49 100644 --- a/servant-foreign/CHANGELOG.md +++ b/servant-foreign/CHANGELOG.md @@ -1,3 +1,14 @@ +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-foreign/CHANGELOG.md) +[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) + +0.10.2 +------ + +### Changes + +* Add instances for `Description` and `Summary` combinators + ([#767](https://github.com/haskell-servant/servant/pull/767)) + 0.10.1 ------ diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 25b72cd2..91024033 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -1,5 +1,5 @@ name: servant-foreign -version: 0.10.1 +version: 0.10.2 synopsis: Helpers for generating clients for servant APIs in any programming language description: Helper types and functions for generating client functions for servant APIs in any programming language @@ -38,7 +38,7 @@ library , Servant.Foreign.Inflections build-depends: base == 4.* , lens == 4.* - , servant == 0.11.* + , servant == 0.12.* , text >= 1.2 && < 1.3 , http-types hs-source-dirs: src diff --git a/servant-server/CHANGELOG.md b/servant-server/CHANGELOG.md index a2a9a750..c3b15cda 100644 --- a/servant-server/CHANGELOG.md +++ b/servant-server/CHANGELOG.md @@ -1,4 +1,7 @@ -Next +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md) +[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) + +0.12 ---- ### Breaking changes diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 6e1f5ccf..b5808a1c 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -1,5 +1,5 @@ name: servant-server -version: 0.11 +version: 0.12 synopsis: A family of combinators for defining webservices APIs and serving them description: A family of combinators for defining webservices APIs and serving them @@ -70,7 +70,7 @@ library , mtl >= 2 && < 2.3 , network >= 2.6 && < 2.7 , safe >= 0.3 && < 0.4 - , servant == 0.11.* + , servant == 0.12.* , split >= 0.2 && < 0.3 , string-conversions >= 0.3 && < 0.5 , system-filepath >= 0.4 && < 0.5 diff --git a/servant/CHANGELOG.md b/servant/CHANGELOG.md index 953db7fa..69b5f9d6 100644 --- a/servant/CHANGELOG.md +++ b/servant/CHANGELOG.md @@ -1,9 +1,40 @@ -Unreleased changes +[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md) + +0.12 --- +### Significant changes + +- *servant-client* *servant-client-core* + Factored out of `servant-client` all the functionality that was + independent of the `http-client` backend. + ([#803](https://github.com/haskell-servant/servant/pull/803) + [#821](https://github.com/haskell-servant/servant/issues/821)) +- *servant-server* Added `hoistServer` member to the `HasServer` class, which is `HasServer` + specific `enter`. + ([#804](https://github.com/haskell-servant/servant/pull/804) + [#824](https://github.com/haskell-servant/servant/pull/824)) +- Add `Description` and `Summary` combinators + ([#767](https://github.com/haskell-servant/servant/pull/767)) - Lower `:>` and `:<|>` infix precedence to 4 and 3 respectively ([#761](https://github.com/haskell-servant/servant/issues/761)) +### Other changes + +- Allow newest dependencies + ([#772](https://github.com/haskell-servant/servant/pull/772) + [#842](https://github.com/haskell-servant/servant/pull/842)) +- Documentation improvements and typo fixes + ([#757](https://github.com/haskell-servant/servant/pull/757) + [#771](https://github.com/haskell-servant/servant/pull/771) + [#775](https://github.com/haskell-servant/servant/pull/775) + [#790](https://github.com/haskell-servant/servant/pull/790) + [#791](https://github.com/haskell-servant/servant/pull/791) + [#806](https://github.com/haskell-servant/servant/pull/806)) +- Development process improvements + ([#764](https://github.com/haskell-servant/servant/pull/764) + [#839](https://github.com/haskell-servant/servant/pull/839)) + 0.11 ---- diff --git a/servant/servant.cabal b/servant/servant.cabal index 26ab1181..df0f1cca 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,5 +1,5 @@ name: servant -version: 0.11 +version: 0.12 synopsis: A family of combinators for defining webservices APIs description: A family of combinators for defining webservices APIs and serving them