yesod 1.4.3.1 → 1.4.4

raw patch · 5 files changed

+14/−12 lines, 5 filesdep +data-default-classdep −data-defaultdep −safedep −yesod-authdep ~basePVP ok

version bump matches the API change (PVP)

Dependencies added: data-default-class

Dependencies removed: data-default, safe, yesod-auth

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• ChangeLog.md +4/−0
• Yesod/Default/Config2.hs +3/−3
• Yesod/Default/Main.hs +3/−3
• Yesod/Default/Util.hs +1/−1
• yesod.cabal +3/−5

@@ -1,3 +1,7 @@+## 1.4.4++* Reduce dependencies+ ## 1.4.3.1  *  Handle exceptions while writing a file in `addStaticContentExternal`

@@ -38,7 +38,7 @@ import System.Environment (getEnvironment) import Network.Wai (Application) import Network.Wai.Handler.Warp-import Safe (readMay)+import Text.Read (readMaybe) import Data.Maybe (fromMaybe) import Control.Concurrent (forkIO, threadDelay) import System.Exit (exitSuccess)@@ -96,8 +96,8 @@ getDevSettings :: Settings -> IO Settings getDevSettings settings = do     env <- getEnvironment-    let p = fromMaybe (getPort settings) $ lookup "PORT" env >>= readMay-        pdisplay = fromMaybe p $ lookup "DISPLAY_PORT" env >>= readMay+    let p = fromMaybe (getPort settings) $ lookup "PORT" env >>= readMaybe+        pdisplay = fromMaybe p $ lookup "DISPLAY_PORT" env >>= readMaybe     putStrLn $ "Devel application launched: http://localhost:" ++ show pdisplay     return $ setPort p settings 

@@ -22,7 +22,7 @@ import Control.Monad (when) import System.Environment (getEnvironment) import Data.Maybe (fromMaybe)-import Safe (readMay)+import Text.Read (readMaybe) import Control.Monad.Logger (Loc, LogSource, LogLevel (LevelError), liftLoc) import System.Log.FastLogger (LogStr, toLogStr) import Language.Haskell.TH.Syntax (qLocation)@@ -120,8 +120,8 @@ defaultDevelApp load getApp = do     conf   <- load     env <- getEnvironment-    let p = fromMaybe (appPort conf) $ lookup "PORT" env >>= readMay-        pdisplay = fromMaybe p $ lookup "DISPLAY_PORT" env >>= readMay+    let p = fromMaybe (appPort conf) $ lookup "PORT" env >>= readMaybe+        pdisplay = fromMaybe p $ lookup "DISPLAY_PORT" env >>= readMaybe     putStrLn $ "Devel application launched: http://localhost:" ++ show pdisplay     app <- getApp conf     return (p, app)

@@ -28,7 +28,7 @@ import Text.Cassius (cassiusFile, cassiusFileReload) import Text.Hamlet (HamletSettings, defaultHamletSettings) import Data.Maybe (catMaybes)-import Data.Default (Default (def))+import Data.Default.Class (Default (def))  -- | An implementation of 'addStaticContent' which stores the contents in an -- external file. Files are created in the given static folder with names based

@@ -1,5 +1,5 @@ name:            yesod-version:         1.4.3.1+version:         1.4.4 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -17,9 +17,8 @@     if os(windows)         cpp-options: -DWINDOWS -    build-depends:   base                      >= 4.3      && < 5+    build-depends:   base                      >= 4.6      && < 5                    , yesod-core                >= 1.4      && < 1.5-                   , yesod-auth                >= 1.4      && < 1.5                    , yesod-persistent          >= 1.4      && < 1.5                    , yesod-form                >= 1.4      && < 1.5                    , monad-control             >= 0.3      && < 1.1@@ -30,8 +29,7 @@                    , blaze-html                >= 0.5                    , blaze-markup              >= 0.5.1                    , aeson-                   , safe-                   , data-default+                   , data-default-class                    , unordered-containers                    , yaml                      >= 0.8.17                    , text