From eac95935e6fff7f01634b56d41960b4b4577ae8b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 30 Dec 2017 22:47:56 +0200 Subject: [PATCH] Switch over to WIP conduit 1.3 --- yesod-bin/yesod-bin.cabal | 6 +++--- yesod-core/yesod-core.cabal | 4 ++-- yesod-eventsource/yesod-eventsource.cabal | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 64f9b818..3bb4f2b5 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -48,9 +48,9 @@ executable yesod , fsnotify >= 0.0 && < 0.3 , split >= 0.2 && < 0.3 , file-embed - , conduit >= 1.2 - , conduit-extra >= 1.2.2 - , resourcet >= 0.3 && < 1.2 + , conduit >= 1.3 + , conduit-extra >= 1.3 + , resourcet >= 1.2 , base64-bytestring , lifted-base , http-reverse-proxy >= 0.4 diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 84ae5ab0..dd5306ec 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -51,8 +51,8 @@ library , fast-logger >= 2.2 , wai-logger >= 0.2 , monad-logger >= 0.3.10 && < 0.4 - , conduit >= 1.2 - , resourcet >= 0.4.9 && < 1.2 + , conduit >= 1.3 + , resourcet >= 1.2 , lifted-base >= 0.1.2 , blaze-html >= 0.5 , blaze-markup >= 0.7.1 diff --git a/yesod-eventsource/yesod-eventsource.cabal b/yesod-eventsource/yesod-eventsource.cabal index bb64a9e3..db77ea47 100644 --- a/yesod-eventsource/yesod-eventsource.cabal +++ b/yesod-eventsource/yesod-eventsource.cabal @@ -16,7 +16,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4 && < 5 , yesod-core == 1.4.* - , conduit >= 0.5 && < 1.3 + , conduit >= 1.3 , wai >= 1.3 , wai-eventsource >= 1.3 , wai-extra