From 25acc5799b4b744a18236dbe2229518a0d92fe7f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 15 Jan 2018 15:57:36 +0200 Subject: [PATCH] Version bumps and changelog updates --- yesod-auth-oauth/ChangeLog.md | 4 ++++ yesod-auth-oauth/yesod-auth-oauth.cabal | 9 ++++----- yesod-auth/ChangeLog.md | 4 ++++ yesod-auth/yesod-auth.cabal | 8 ++++---- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/yesod-bin.cabal | 3 +-- yesod-core/ChangeLog.md | 9 +++++++-- yesod-core/Yesod/Core/Types.hs | 2 +- yesod-core/yesod-core.cabal | 2 +- yesod-eventsource/ChangeLog.md | 4 ++++ yesod-eventsource/yesod-eventsource.cabal | 4 ++-- yesod-form/ChangeLog.md | 4 ++++ yesod-form/yesod-form.cabal | 6 +++--- yesod-newsfeed/ChangeLog.md | 4 ++++ yesod-newsfeed/yesod-newsfeed.cabal | 4 ++-- yesod-persistent/ChangeLog.md | 4 ++++ yesod-persistent/yesod-persistent.cabal | 4 ++-- yesod-sitemap/ChangeLog.md | 3 +++ yesod-sitemap/yesod-sitemap.cabal | 4 ++-- yesod-static/ChangeLog.md | 4 ++++ yesod-static/yesod-static.cabal | 6 +++--- yesod-test/ChangeLog.md | 4 ++++ yesod-test/yesod-test.cabal | 8 +++----- yesod-websockets/ChangeLog.md | 4 ++++ yesod-websockets/yesod-websockets.cabal | 6 +++--- yesod/ChangeLog.md | 4 ++++ yesod/yesod.cabal | 9 ++++----- 27 files changed, 89 insertions(+), 42 deletions(-) diff --git a/yesod-auth-oauth/ChangeLog.md b/yesod-auth-oauth/ChangeLog.md index fb5ca395..9e1ca6ea 100644 --- a/yesod-auth-oauth/ChangeLog.md +++ b/yesod-auth-oauth/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.2 * Fix warnings diff --git a/yesod-auth-oauth/yesod-auth-oauth.cabal b/yesod-auth-oauth/yesod-auth-oauth.cabal index c21ac9e1..3176f6bd 100644 --- a/yesod-auth-oauth/yesod-auth-oauth.cabal +++ b/yesod-auth-oauth/yesod-auth-oauth.cabal @@ -1,5 +1,5 @@ name: yesod-auth-oauth -version: 1.4.2 +version: 1.6.0 license: BSD3 license-file: LICENSE author: Hiromi Ishii @@ -23,12 +23,11 @@ library build-depends: base >= 4 && < 4.3 build-depends: authenticate-oauth >= 1.5 && < 1.7 , bytestring >= 0.9.1.4 - , yesod-core >= 1.4 && < 1.5 - , yesod-auth >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 + , yesod-auth >= 1.6 && < 1.7 , text >= 0.7 - , yesod-form >= 1.4 && < 1.5 + , yesod-form >= 1.6 && < 1.7 , transformers >= 0.2.2 && < 0.6 - , lifted-base >= 0.2 && < 0.3 exposed-modules: Yesod.Auth.OAuth ghc-options: -Wall diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index 095ccbd6..69ac6519 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.21 * Add redirectToCurrent to Yesod.Auth module for controlling setUltDestCurrent in redirectLogin [#1461](https://github.com/yesodweb/yesod/pull/1461) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 194638f5..1ba37f7e 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.4.21 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -23,7 +23,7 @@ library build-depends: base >= 4 && < 5 , authenticate >= 1.3 , bytestring >= 0.9.1.4 - , yesod-core >= 1.4.31 && < 1.5 + , yesod-core >= 1.6 && < 1.7 , wai >= 1.4 , template-haskell , base16-bytestring @@ -32,11 +32,11 @@ library , random >= 1.0.0.2 , text >= 0.7 , mime-mail >= 0.3 - , yesod-persistent >= 1.4 + , yesod-persistent >= 1.6 , shakespeare , containers , unordered-containers - , yesod-form >= 1.4 && < 1.5 + , yesod-form >= 1.6 && < 1.7 , transformers >= 0.2.2 , persistent >= 2.1 && < 2.8 , persistent-template >= 2.1 && < 2.8 diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 0020b34a..f82a8fbd 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to conduit 1.3.0 + ## 1.5.3 * Support typed-process-0.2.0.0 diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 3bb4f2b5..df153e75 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.5.3 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -52,7 +52,6 @@ executable yesod , conduit-extra >= 1.3 , resourcet >= 1.2 , base64-bytestring - , lifted-base , http-reverse-proxy >= 0.4 , network >= 2.5 , http-client-tls diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 88a0dcb2..6d07c61e 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,9 +1,14 @@ -## 1.4.38 +## 1.6.0 +* Upgrade to conduit 1.3.0 +* Switch to `MonadUnliftIO` +* Drop `mwc-random` and `blaze-builder` dependencies +* Strictify some internal data structures +* Add `CI` wrapper to first field in `Header` data constructor + [#1418](https://github.com/yesodweb/yesod/issues/1418) * Internal only change, users of stable API are unaffected: `WidgetT` holds its data in an `IORef` so that it is isomorphic to `ReaderT`, avoiding state-loss issues.. -* Instances for `MonadUnliftIO` ## 1.4.37.2 diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs index c7799b7c..78ec0fef 100644 --- a/yesod-core/Yesod/Core/Types.hs +++ b/yesod-core/Yesod/Core/Types.hs @@ -325,7 +325,7 @@ data Header = AddCookie !SetCookie | DeleteCookie !ByteString !ByteString -- ^ name and path - | Header !ByteString !ByteString + | Header !(CI ByteString) !ByteString -- ^ key and value deriving (Eq, Show) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 4c2db3ed..bc05c81b 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.4.38 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman diff --git a/yesod-eventsource/ChangeLog.md b/yesod-eventsource/ChangeLog.md index f7658231..a5b12741 100644 --- a/yesod-eventsource/ChangeLog.md +++ b/yesod-eventsource/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.1 * Fix warnings diff --git a/yesod-eventsource/yesod-eventsource.cabal b/yesod-eventsource/yesod-eventsource.cabal index db77ea47..7105ca77 100644 --- a/yesod-eventsource/yesod-eventsource.cabal +++ b/yesod-eventsource/yesod-eventsource.cabal @@ -1,5 +1,5 @@ name: yesod-eventsource -version: 1.4.1 +version: 1.6.0 license: MIT license-file: LICENSE author: Felipe Lessa @@ -15,7 +15,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 - , yesod-core == 1.4.* + , yesod-core == 1.6.* , conduit >= 1.3 , wai >= 1.3 , wai-eventsource >= 1.3 diff --git a/yesod-form/ChangeLog.md b/yesod-form/ChangeLog.md index a941f21a..9af79a52 100644 --- a/yesod-form/ChangeLog.md +++ b/yesod-form/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.16 * Korean translation diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 4f252938..aa54488a 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.4.16 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -20,8 +20,8 @@ flag network-uri library build-depends: base >= 4 && < 5 - , yesod-core >= 1.4.14 && < 1.5 - , yesod-persistent >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 + , yesod-persistent >= 1.6 && < 1.7 , time >= 1.1.4 , shakespeare >= 2.0 , persistent diff --git a/yesod-newsfeed/ChangeLog.md b/yesod-newsfeed/ChangeLog.md index eaaf8753..fb70d46b 100644 --- a/yesod-newsfeed/ChangeLog.md +++ b/yesod-newsfeed/ChangeLog.md @@ -1,5 +1,9 @@ # Changelog +## 1.6.1 + +* Upgrade to yesod-core 1.6.0 + ## 1.6 * Create new datatype `EntryEnclosure` for self-documentation of `feedEntryEnclosure`. diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal index b8d57c7d..cc4b9e6b 100644 --- a/yesod-newsfeed/yesod-newsfeed.cabal +++ b/yesod-newsfeed/yesod-newsfeed.cabal @@ -1,5 +1,5 @@ name: yesod-newsfeed -version: 1.6 +version: 1.6.1.0 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -15,7 +15,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 - , yesod-core >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 , time >= 1.1.4 , shakespeare >= 2.0 , bytestring >= 0.9.1.4 diff --git a/yesod-persistent/ChangeLog.md b/yesod-persistent/ChangeLog.md index a7343ed8..1cda90f9 100644 --- a/yesod-persistent/ChangeLog.md +++ b/yesod-persistent/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.3 * Fix overly powerful constraints on get404 and getBy404. diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal index a2c255dd..4ac6dca7 100644 --- a/yesod-persistent/yesod-persistent.cabal +++ b/yesod-persistent/yesod-persistent.cabal @@ -1,5 +1,5 @@ name: yesod-persistent -version: 1.4.3 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -15,7 +15,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 - , yesod-core >= 1.4.0 && < 1.5 + , yesod-core >= 1.6 && < 1.7 , persistent >= 2.1 && < 2.8 , persistent-template >= 2.1 && < 2.8 , transformers >= 0.2.2 diff --git a/yesod-sitemap/ChangeLog.md b/yesod-sitemap/ChangeLog.md index e69de29b..646e7378 100644 --- a/yesod-sitemap/ChangeLog.md +++ b/yesod-sitemap/ChangeLog.md @@ -0,0 +1,3 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal index 511a21b7..b88a7546 100644 --- a/yesod-sitemap/yesod-sitemap.cabal +++ b/yesod-sitemap/yesod-sitemap.cabal @@ -1,5 +1,5 @@ name: yesod-sitemap -version: 1.4.0.1 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -15,7 +15,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 - , yesod-core >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 , time >= 1.1.4 , xml-conduit >= 1.0 , text diff --git a/yesod-static/ChangeLog.md b/yesod-static/ChangeLog.md index fdb162a8..0e30e941 100644 --- a/yesod-static/ChangeLog.md +++ b/yesod-static/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.5.3.1 * Switch to cryptonite diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 8ddf0dbc..e5135d05 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -1,5 +1,5 @@ name: yesod-static -version: 1.5.3.1 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -29,7 +29,7 @@ library build-depends: base >= 4 && < 5 , containers >= 0.2 , old-time >= 1.0 - , yesod-core >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 , base64-bytestring >= 0.1.0.1 , byteable >= 0.1 , bytestring >= 0.9.1.4 @@ -91,7 +91,7 @@ test-suite tests YesodStaticTest build-depends: base , hspec >= 1.3 - , yesod-test >= 1.4 + , yesod-test >= 1.6 , wai-extra , HUnit diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md index 1ce26713..07c308ef 100644 --- a/yesod-test/ChangeLog.md +++ b/yesod-test/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.5.9.1 * Fixes a Haddock syntax error in 1.5.9 [#1473](https://github.com/yesodweb/yesod/pull/1473) diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index c49e12fe..6585217c 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -1,5 +1,5 @@ name: yesod-test -version: 1.5.9.1 +version: 1.6.0 license: MIT license-file: LICENSE author: Nubis @@ -27,7 +27,6 @@ library , hspec-core == 2.* , html-conduit >= 0.1 , http-types >= 0.7 - , monad-control , network >= 2.2 , persistent >= 1.0 , pretty-show >= 1.6 @@ -38,7 +37,7 @@ library , wai-extra , xml-conduit >= 1.0 , xml-types >= 0.3 - , yesod-core >= 1.4.14 + , yesod-core >= 1.6 exposed-modules: Yesod.Test Yesod.Test.CssQuery @@ -58,10 +57,9 @@ test-suite test , containers , html-conduit , yesod-core - , yesod-form >= 1.4.14 + , yesod-form >= 1.6 , text , wai - , lifted-base , http-types source-repository head diff --git a/yesod-websockets/ChangeLog.md b/yesod-websockets/ChangeLog.md index 74ece92f..9b9a22f6 100644 --- a/yesod-websockets/ChangeLog.md +++ b/yesod-websockets/ChangeLog.md @@ -1,3 +1,7 @@ +## 0.3.0 + +* Upgrade to yesod-core 1.6 + ## 0.2.6 * Fix warnings diff --git a/yesod-websockets/yesod-websockets.cabal b/yesod-websockets/yesod-websockets.cabal index 70bfc00b..23f6b800 100644 --- a/yesod-websockets/yesod-websockets.cabal +++ b/yesod-websockets/yesod-websockets.cabal @@ -1,5 +1,5 @@ name: yesod-websockets -version: 0.2.6 +version: 0.3.0 synopsis: WebSockets support for Yesod description: WebSockets support for Yesod homepage: https://github.com/yesodweb/yesod @@ -23,9 +23,9 @@ library , wai-websockets >= 2.1 , websockets >= 0.9 , transformers >= 0.2 - , yesod-core >= 1.4 + , yesod-core >= 1.6 , unliftio - , conduit >= 1.0.15.1 + , conduit >= 1.3 source-repository head type: git diff --git a/yesod/ChangeLog.md b/yesod/ChangeLog.md index 6799776d..db13e23b 100644 --- a/yesod/ChangeLog.md +++ b/yesod/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6 + ## 1.4.5 * Fix warnings diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 5eb0f06e..67309efe 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.4.5 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -18,10 +18,9 @@ library cpp-options: -DWINDOWS build-depends: base >= 4.6 && < 5 - , yesod-core >= 1.4 && < 1.5 - , yesod-persistent >= 1.4 && < 1.5 - , yesod-form >= 1.4 && < 1.5 - , monad-control >= 0.3 && < 1.1 + , yesod-core >= 1.6 && < 1.7 + , yesod-persistent >= 1.6 && < 1.7 + , yesod-form >= 1.6 && < 1.7 , transformers >= 0.2.2 , wai >= 1.3 , wai-extra >= 1.3