diff --git a/yesod-core/Yesod/Core/Internal/Util.hs b/yesod-core/Yesod/Core/Internal/Util.hs index 1e705795..27f70a52 100644 --- a/yesod-core/Yesod/Core/Internal/Util.hs +++ b/yesod-core/Yesod/Core/Internal/Util.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Yesod.Core.Internal.Util ( putTime , getTime @@ -11,7 +12,12 @@ import Data.Serialize (Get, Put, Serialize (..)) import qualified Data.Text as T import Data.Time (Day (ModifiedJulianDay, toModifiedJulianDay), DiffTime, UTCTime (..), formatTime) + +#if MIN_VERSION_time(1,5,0) +import Data.Time (defaultTimeLocale) +#else import System.Locale (defaultTimeLocale) +#endif putTime :: UTCTime -> Put putTime (UTCTime d t) = diff --git a/yesod-core/changelog.md b/yesod-core/changelog.md index 08673e42..09e86348 100644 --- a/yesod-core/changelog.md +++ b/yesod-core/changelog.md @@ -1,7 +1,19 @@ -__1.4.4.2__ `neverExpires` uses dates one year in the future (instead of in 2037). +## 1.4.4.5 -__1.4.4.1__ Improvements to etag/if-none-match support #868 #869 +Support time 1.5 -__1.4.4__ Add the `notModified` and `setEtag` functions. +## 1.4.4.2 -__1.4.3__ Switch to mwc-random for token generation. +`neverExpires` uses dates one year in the future (instead of in 2037). + +## 1.4.4.1 + +Improvements to etag/if-none-match support #868 #869 + +## 1.4.4 + +Add the `notModified` and `setEtag` functions. + +## 1.4.3 + +Switch to mwc-random for token generation. diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 19b5ccc8..fdfffded 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.4.4.4 +version: 1.4.4.5 license: MIT license-file: LICENSE author: Michael Snoyman