diff --git a/project_template/barebones/foo.cabal b/project_template/barebones/foo.cabal --- a/project_template/barebones/foo.cabal +++ b/project_template/barebones/foo.cabal @@ -16,7 +16,7 @@ Build-depends: base >= 4 && < 5, - bytestring >= 0.9.1 && < 0.10, + bytestring >= 0.9.1 && < 0.11, MonadCatchIO-transformers >= 0.2.1 && < 0.4, mtl >= 2 && < 3, snap-core >= 0.9.2 && < 0.10, diff --git a/project_template/default/foo.cabal b/project_template/default/foo.cabal --- a/project_template/default/foo.cabal +++ b/project_template/default/foo.cabal @@ -20,7 +20,7 @@ Build-depends: base >= 4 && < 5, - bytestring >= 0.9.1 && < 0.10, + bytestring >= 0.9.1 && < 0.11, data-lens >= 2.0.1 && < 2.11, data-lens-template >= 2.1 && < 2.2, heist >= 0.8 && < 0.9, diff --git a/project_template/tutorial/foo.cabal b/project_template/tutorial/foo.cabal --- a/project_template/tutorial/foo.cabal +++ b/project_template/tutorial/foo.cabal @@ -16,7 +16,7 @@ Build-depends: base >= 4 && < 5, - bytestring >= 0.9.1 && < 0.10, + bytestring >= 0.9.1 && < 0.11, MonadCatchIO-transformers >= 0.2.1 && < 0.4, mtl >= 2 && < 3, snap >= 0.9.2 && < 0.10, diff --git a/snap.cabal b/snap.cabal --- a/snap.cabal +++ b/snap.cabal @@ -1,5 +1,5 @@ name: snap -version: 0.9.2.1 +version: 0.9.2.2 synopsis: Top-level package for the Snap Web Framework description: This is the top-level package for the official Snap Framework libraries. @@ -133,10 +133,6 @@ Snap.Snaplet.Session.SecureCookie, Snap.Snaplet.Session.SessionManager - if !os(windows) - build-depends: - unix >= 2.2.0.0 && < 2.7 - build-depends: MonadCatchIO-transformers >= 0.2 && < 0.4, aeson >= 0.6 && < 0.7, @@ -148,7 +144,7 @@ configurator >= 0.1 && < 0.3, containers >= 0.3 && < 0.6, directory >= 1.0 && < 1.3, - directory-tree >= 0.10 && < 0.11, + directory-tree >= 0.10 && < 0.12, data-lens >= 2.0.1 && < 2.11, data-lens-template >= 2.1 && < 2.2, filepath >= 1.1 && < 1.4, @@ -162,13 +158,11 @@ snap-server >= 0.9.2 && < 0.10, stm >= 2.2 && < 2.5, syb >= 0.1 && < 0.4, - template-haskell >= 2.2 && < 2.9, text >= 0.11 && < 0.12, time >= 1.1 && < 1.5, transformers >= 0.2 && < 0.4, unordered-containers >= 0.1.4 && < 0.3, - utf8-string >= 0.3 && < 0.4, - vector >= 0.7.1 && < 0.10, + vector >= 0.7.1 && < 0.11, vector-algorithms >= 0.4 && < 0.6, xmlhtml >= 0.1 && < 0.3 @@ -210,7 +204,7 @@ bytestring >= 0.9.1 && < 0.11, containers >= 0.3 && < 0.6, directory >= 1.0 && < 1.3, - directory-tree >= 0.10 && < 0.11, + directory-tree >= 0.10 && < 0.12, filepath >= 1.1 && < 1.4, old-time >= 1.0 && < 1.2, snap-server >= 0.9.1 && < 0.10, diff --git a/src/Snap/Snaplet/HeistNoClass.hs b/src/Snap/Snaplet/HeistNoClass.hs --- a/src/Snap/Snaplet/HeistNoClass.hs +++ b/src/Snap/Snaplet/HeistNoClass.hs @@ -48,12 +48,12 @@ import Control.Monad.State import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as B -import qualified Data.ByteString.UTF8 as U import Data.Maybe import Data.Monoid import Data.Lens.Lazy import Data.Text (Text) import qualified Data.Text as T +import Data.Text.Encoding import System.FilePath.Posix import Text.Templating.Heist import Text.Templating.Heist.Splices.Cache @@ -296,7 +296,8 @@ ts <- liftIO $ loadTemplates templateDir mempty >>= either error return rootUrl <- getSnapletRootURL - let fullPrefix = U.toString rootUrl U.toString urlPrefix + let fullPrefix = (T.unpack $ decodeUtf8 rootUrl) + (T.unpack $ decodeUtf8 urlPrefix) printInfo $ T.pack $ unwords [ "...adding" , (show $ length $ templateNames ts) @@ -306,7 +307,7 @@ , fullPrefix ++ "/" ] addPostInitHook $ return . changeTS - (`mappend` addTemplatePathPrefix (U.fromString fullPrefix) ts) + (`mappend` addTemplatePathPrefix (encodeUtf8 $ T.pack fullPrefix) ts) ------------------------------------------------------------------------------ diff --git a/test/snap-testsuite.cabal b/test/snap-testsuite.cabal --- a/test/snap-testsuite.cabal +++ b/test/snap-testsuite.cabal @@ -8,33 +8,32 @@ main-is: TestSuite.hs build-depends: - Glob >= 0.5 && < 0.8, - HUnit >= 1.2 && < 2, - MonadCatchIO-transformers >= 0.2 && < 0.4, + Glob >= 0.5 && < 0.8, + HUnit >= 1.2 && < 2, + MonadCatchIO-transformers >= 0.2 && < 0.4, QuickCheck >= 2.3.0.2, - attoparsec >= 0.10 && <0.11, - base >= 4 && < 5, - bytestring >= 0.9 && < 0.10, + attoparsec >= 0.10 && < 0.11, + base >= 4 && < 5, + bytestring >= 0.9 && < 0.11, containers >= 0.3, - data-lens >= 2.0.1 && < 2.11, - data-lens-template >= 2.1.1 && < 2.2, + data-lens >= 2.0.1 && < 2.11, + data-lens-template >= 2.1.1 && < 2.2, directory, - directory-tree >= 0.10 && < 0.11, + directory-tree >= 0.10 && < 0.12, filepath, - heist >= 0.7 && < 0.9, - http-conduit >= 1.4 && < 1.7, - http-types >= 0.6 && < 0.8, + heist >= 0.7 && < 0.9, + http-conduit >= 1.4 && < 1.7, + http-types >= 0.6 && < 0.8, mtl >= 2, process == 1.*, snap-core >= 0.9 && < 0.10, snap-server >= 0.9 && < 0.10, - test-framework >= 0.6 && <0.7, - test-framework-hunit >= 0.2.7 && <0.3, - test-framework-quickcheck2 >= 0.2.12.1 && <0.3, - text >= 0.11 && < 0.12, + test-framework >= 0.6 && < 0.7, + test-framework-hunit >= 0.2.7 && < 0.3, + test-framework-quickcheck2 >= 0.2.12.1 && < 0.3, + text >= 0.11 && < 0.12, transformers >= 0.2, - unix >= 2.2.0.0 && < 2.7, - utf8-string >= 0.3 && < 0.4, + unix >= 2.2.0.0 && < 2.7, template-haskell extensions: @@ -68,7 +67,7 @@ MonadCatchIO-transformers >= 0.2 && < 0.4, attoparsec >= 0.10 && < 0.11, base >= 4 && < 5, - bytestring >= 0.9 && < 0.10, + bytestring >= 0.9 && < 0.11, cereal >= 0.3, clientsession >= 0.7.3.6 && < 0.9, configurator >= 0.1 && < 0.3, @@ -76,7 +75,7 @@ data-lens >= 2.0.1 && < 2.11, data-lens-template >= 2.1.1 && < 2.2, directory, - directory-tree >= 0.10 && < 0.11, + directory-tree >= 0.10 && < 0.12, filepath, hashable >= 1.1, heist >= 0.7 && < 0.9, @@ -90,7 +89,6 @@ text >= 0.11 && < 0.12, transformers >= 0.2, unordered-containers >= 0.1.4, - utf8-string >= 0.3 && < 0.4, template-haskell --FIXME @@ -124,12 +122,12 @@ MonadCatchIO-transformers >= 0.2 && < 0.4, attoparsec >= 0.10 && < 0.11, base >= 4 && < 5, - bytestring >= 0.9 && < 0.10, + bytestring >= 0.9 && < 0.11, containers >= 0.3, data-lens >= 2.0.1 && < 2.11, data-lens-template >= 2.1 && < 2.2, directory, - directory-tree >= 0.10 && < 0.11, + directory-tree >= 0.10 && < 0.12, filepath, heist >= 0.7 && < 0.9, mtl >= 2, @@ -138,7 +136,6 @@ snap-server >= 0.9 && < 0.10, text >= 0.11 && < 0.12, transformers >= 0.2, - utf8-string >= 0.3 && < 0.4, template-haskell extensions: