From 60faea0aba9e38b2de16145c82c83b227d1b6eec Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Thu, 26 Jan 2012 20:55:17 -0800 Subject: [PATCH 1/2] Bump wai-extra deps for scaffold projects --- yesod/scaffold/project.cabal.cg | 2 +- yesod/scaffold/tiny/project.cabal.cg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 065f35a0..95bc1ee0 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -93,7 +93,7 @@ executable ~project~ , shakespeare-text >= 0.10 && < 0.11 , hjsmin >= 0.0.14 && < 0.1 , monad-control >= 0.3 && < 0.4 - , wai-extra >= 1.0 && < 1.1 + , wai-extra >= 1.0 && < 1.2 , yaml >= 0.5 && < 0.6 , http-conduit >= 1.2 && < 1.3 diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index 7bd4ae6f..7f40561e 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -76,7 +76,7 @@ executable ~project~ , hamlet >= 0.10 && < 0.11 , shakespeare-text >= 0.10 && < 0.11 , wai >= 1.0 && < 1.1 - , wai-extra >= 1.0 && < 1.1 + , wai-extra >= 1.0 && < 1.2 , transformers >= 0.2 && < 0.3 , monad-control >= 0.3 && < 0.4 , yaml >= 0.5 && < 0.6 From 9290a11ab2f9e6aa4f2069eb74f4c6cafe6cc7f9 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Thu, 26 Jan 2012 21:40:31 -0800 Subject: [PATCH 2/2] Removes use of deprecated logHandleDev. --- yesod/scaffold/Application.hs.cg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index 0d419e8f..0de3dcfa 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -13,7 +13,7 @@ import Yesod.Default.Main import Yesod.Default.Handlers #if DEVELOPMENT import Yesod.Logger (Logger, logBS) -import Network.Wai.Middleware.RequestLogger (logHandleDev) +import Network.Wai.Middleware.RequestLogger (logCallbackDev) #else import Yesod.Logger (Logger, logBS, toProduction) import Network.Wai.Middleware.RequestLogger (logHandle) @@ -46,7 +46,7 @@ getApplication conf logger = do return $ logWare app where #ifdef DEVELOPMENT - logWare = logHandleDev (logBS setLogger) + logWare = logCallbackDev (logBS setLogger) setLogger = logger #else setLogger = toProduction logger -- by default the logger is set for development