diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index 1997bdbe..987a0ecc 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -1056,10 +1056,16 @@ instance MonadResource (GHandler sub master) where #endif instance MonadLogger (GHandler sub master) where +#if MIN_VERSION_monad_logger(0, 3, 0) + monadLoggerLog a b c d = do + hd <- ask + liftIO $ handlerLog hd a b c (toLogStr d) +#else monadLoggerLog a c d = monadLoggerLogSource a "" c d monadLoggerLogSource a b c d = do hd <- ask liftIO $ handlerLog hd a b c (toLogStr d) +#endif instance Exception e => Failure e (GHandler sub master) where failure = liftIO . throwIO diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index bd94bd39..63ea210a 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -361,5 +361,9 @@ instance MonadResource (GWidget sub master) where #endif instance MonadLogger (GWidget sub master) where +#if MIN_VERSION_monad_logger(0, 3, 0) + monadLoggerLog a b c = lift . monadLoggerLog a b c +#else monadLoggerLog a b = lift . monadLoggerLog a b monadLoggerLogSource a b c = lift . monadLoggerLogSource a b c +#endif diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index e7520637..d5b239e8 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -79,8 +79,8 @@ library , vector >= 0.9 && < 0.11 , aeson >= 0.5 , fast-logger >= 0.2 - , monad-logger >= 0.2.1 && < 0.3 - , conduit >= 0.5 && < 0.6 + , monad-logger >= 0.2.1 && < 0.4 + , conduit >= 0.5 , resourcet >= 0.3 && < 0.5 , lifted-base >= 0.1 , blaze-html >= 0.5 && < 0.6 diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal index 013db642..8908bf8c 100644 --- a/yesod-default/yesod-default.cabal +++ b/yesod-default/yesod-default.cabal @@ -30,7 +30,7 @@ library , shakespeare-js >= 1.0 && < 1.2 , template-haskell , yaml >= 0.8 && < 0.9 - , network-conduit >= 0.5 && < 0.7 + , network-conduit >= 0.5 , unordered-containers , hamlet >= 1.1 && < 1.2 , data-default diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal index c9115f04..08296eea 100644 --- a/yesod-json/yesod-json.cabal +++ b/yesod-json/yesod-json.cabal @@ -14,21 +14,21 @@ description: Generate content for Yesod using the aeson package. library build-depends: base >= 4 && < 5 - , yesod-core >= 1.1 && < 1.2 - , yesod-routes >= 1.1 && < 1.2 + , yesod-core >= 1.1 + , yesod-routes >= 1.1 , aeson >= 0.5 - , text >= 0.8 && < 1.0 - , shakespeare-js >= 1.0 && < 1.2 + , text >= 0.8 + , shakespeare-js >= 1.0 , vector >= 0.9 , containers >= 0.2 , blaze-builder - , attoparsec-conduit >= 0.5 && < 0.6 - , conduit >= 0.5 && < 0.6 - , transformers >= 0.2.2 && < 0.4 - , wai >= 1.3 && < 1.4 - , wai-extra >= 1.3 && < 1.4 + , attoparsec-conduit >= 0.5 + , conduit >= 0.5 + , transformers >= 0.2.2 + , wai >= 1.3 + , wai-extra >= 1.3 , bytestring >= 0.9 - , safe >= 0.2 && < 0.4 + , safe >= 0.2 exposed-modules: Yesod.Json ghc-options: -Wall diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal index 5ecff41d..a5b217bc 100644 --- a/yesod-newsfeed/yesod-newsfeed.cabal +++ b/yesod-newsfeed/yesod-newsfeed.cabal @@ -18,10 +18,10 @@ library , time >= 1.1.4 , hamlet >= 1.1 && < 1.2 , bytestring >= 0.9.1.4 - , text >= 0.9 && < 0.12 - , xml-conduit >= 1.0 && < 1.1 - , blaze-html >= 0.5 && < 0.6 - , blaze-markup >= 0.5.1 && < 0.6 + , text >= 0.9 + , xml-conduit >= 1.0 + , blaze-html >= 0.5 + , blaze-markup >= 0.5.1 , containers exposed-modules: Yesod.AtomFeed diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal index 31e63ac6..55c26a63 100644 --- a/yesod-sitemap/yesod-sitemap.cabal +++ b/yesod-sitemap/yesod-sitemap.cabal @@ -16,7 +16,7 @@ library build-depends: base >= 4 && < 5 , yesod-core >= 1.1 && < 1.2 , time >= 1.1.4 - , xml-conduit >= 1.0 && < 1.1 + , xml-conduit >= 1.0 , text , containers exposed-modules: Yesod.Sitemap diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 045fb0f9..1113ee7e 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -36,8 +36,8 @@ library , file-embed >= 0.0.4.1 && < 0.5 , http-types >= 0.7 , unix-compat >= 0.2 - , conduit >= 0.5 && < 0.6 - , crypto-conduit >= 0.4 && < 0.5 + , conduit >= 0.5 + , crypto-conduit >= 0.4 , cryptohash >= 0.6.1 , system-filepath >= 0.4.6 && < 0.5 exposed-modules: Yesod.Static diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 040ed8fa..1773445b 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -15,24 +15,24 @@ extra-source-files: README.md, LICENSE, test/main.hs library build-depends: base >= 4.3 && < 5 - , attoparsec >= 0.10 && < 0.11 - , persistent >= 1.0 && < 1.2 - , transformers >= 0.2.2 && < 0.4 - , wai >= 1.3 && < 1.4 - , wai-test >= 1.3 && < 1.4 + , attoparsec >= 0.10 + , persistent >= 1.0 + , transformers >= 0.2.2 + , wai >= 1.3 + , wai-test >= 1.3 , network >= 2.2 , http-types >= 0.7 - , HUnit >= 1.2 && < 1.3 + , HUnit >= 1.2 , hspec >= 1.4 , bytestring >= 0.9 , case-insensitive >= 0.2 , text - , xml-conduit >= 1.0 && < 1.1 - , xml-types >= 0.3 && < 0.4 + , xml-conduit >= 1.0 + , xml-types >= 0.3 , containers - , html-conduit >= 0.1 && < 0.2 - , blaze-html >= 0.5 && < 0.6 - , blaze-markup >= 0.5.1 && < 0.6 + , html-conduit >= 0.1 + , blaze-html >= 0.5 + , blaze-markup >= 0.5.1 , pool-conduit , monad-control , time diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 741f19ab..e04190a6 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -101,7 +101,7 @@ executable yesod , fsnotify >= 0.0 && < 0.1 , split >= 0.2 && < 0.3 , file-embed - , conduit >= 0.5 && < 0.6 + , conduit >= 0.5 && < 1.1 , resourcet >= 0.3 && < 0.5 , base64-bytestring , lifted-base