Merge pull request #10 from 23Skidoo/bump-deps

Bump dependencies.
snapframework · Sep 11, 2014 · 7897fb5 · 7897fb5
2 parents 1563bde + 0231cb9
commit 7897fb5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/snap-static-pages.cabal b/snap-static-pages.cabal
@@ -23,22 +23,23 @@ Library
 
     ghc-options: -Wall -funbox-strict-fields -O2 -funfolding-use-threshold=16
     Build-Depends: base >= 4 && <5,
-                   aeson >= 0.6 && <0.8,
-                   attoparsec >= 0.10 && <0.12,
+                   aeson >= 0.6 && <0.9,
+                   attoparsec >= 0.10 && <0.13,
                    blaze-builder,
                    bytestring,
                    containers,
                    directory,
                    feed,
                    filepath,
-                   heist >= 0.13 && <0.14,
+                   heist >= 0.13 && <1.1,
+                   map-syntax >= 0.1 && <0.2,
                    mtl >= 2,
                    old-locale,
-                   snap      >= 0.9 && <0.14,
-                   snap-core >= 0.9 && <0.10,
+                   snap      >= 0.9 && <1.1,
+                   snap-core >= 0.9 && <1.1,
                    split,
                    system-fileio,
-                   text >= 0.11 && <1.2,
+                   text >= 0.11 && <1.3,
                    time,
                    transformers,
                    utf8-string,

diff --git a/src/Snap/StaticPages.hs b/src/Snap/StaticPages.hs
@@ -23,7 +23,7 @@ import           Control.Monad
 import           Control.Monad.Trans
 import qualified Data.ByteString.Char8 as B
 import           Data.Aeson
-import qualified Data.Attoparsec as Atto
+import qualified Data.Attoparsec.ByteString as Atto
 import           Data.List
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T

diff --git a/src/Snap/StaticPages/Internal/Handlers.hs b/src/Snap/StaticPages/Internal/Handlers.hs
@@ -10,6 +10,7 @@ import qualified Data.ByteString.Char8 as B
 import           Data.ByteString.Char8 (ByteString)
 import           Data.List
 import qualified Data.Map as Map
+import           Data.Map.Syntax ((##))
 import           Data.Maybe
 import           Data.Text (Text)
 import qualified Data.Text as T

diff --git a/src/Snap/StaticPages/Internal/Post.hs b/src/Snap/StaticPages/Internal/Post.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE OverloadedStrings  #-}
 {-# LANGUAGE PackageImports #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE CPP #-}
 
 module Snap.StaticPages.Internal.Post
   ( getTimeStamp
@@ -35,7 +36,11 @@ where
 ------------------------------------------------------------------------
 import           Control.Applicative
 import           Control.Exception
+#if MIN_VERSION_mtl(2,2,1)
+import           Control.Monad.Except
+#else
 import           Control.Monad.Error
+#endif
 import qualified Data.Attoparsec.Text as Atto
 import           Data.Attoparsec.Text (Parser)
 import qualified Data.ByteString.Char8 as B