diff --git a/yesod-platform/make-cabal.sh b/yesod-platform/make-cabal.sh index 318df0f0..7503287d 100755 --- a/yesod-platform/make-cabal.sh +++ b/yesod-platform/make-cabal.sh @@ -7,4 +7,4 @@ then cabal install cabal-nirvana -fgenerate fi -cabal-nirvana-generate yesod yesod-static yesod-default hjsmin | runghc to-cabal.hs > yesod-platform.cabal +cabal-nirvana-generate yesod yesod-static yesod-default hjsmin blaze-html | runghc to-cabal.hs > yesod-platform.cabal diff --git a/yesod-platform/yesod-platform.cabal b/yesod-platform/yesod-platform.cabal index 780e11a1..487e221a 100644 --- a/yesod-platform/yesod-platform.cabal +++ b/yesod-platform/yesod-platform.cabal @@ -1,5 +1,5 @@ name: yesod-platform -version: 1.0.1 +version: 1.0.2 license: MIT license-file: LICENSE author: Michael Snoyman @@ -21,13 +21,14 @@ library , attoparsec == 0.10.1.1 , attoparsec-conduit == 0.4.0 , attoparsec-enumerator == 0.3 - , authenticate == 1.2.0.1 + , authenticate == 1.2.1 , base-unicode-symbols == 0.2.2.3 , base64-bytestring == 0.1.1.1 , binary == 0.5.1.0 , blaze-builder == 0.3.1.0 , blaze-builder-conduit == 0.4.0.1 - , blaze-html == 0.4.3.3 + , blaze-html == 0.5.0.0 + , blaze-markup == 0.5.1.0 , byteorder == 1.0.3 , case-insensitive == 0.4.0.1 , cereal == 0.3.5.1 @@ -36,11 +37,11 @@ library , conduit == 0.4.1.1 , cookie == 0.4.0 , cprng-aes == 0.2.3 - , crypto-api == 0.9 - , crypto-conduit == 0.3.1 + , crypto-api == 0.10.1 + , crypto-conduit == 0.3.2 , crypto-pubkey-types == 0.1.1 , cryptocipher == 0.3.0 - , cryptohash == 0.7.4 + , cryptohash == 0.7.5 , css-text == 0.1.1 , data-default == 0.4.0 , dlist == 0.5 @@ -50,22 +51,21 @@ library , failure == 0.2.0.1 , fast-logger == 0.0.2 , file-embed == 0.0.4.2 - , hamlet == 1.0.1 + , hamlet == 1.0.1.1 , hashable == 1.1.2.3 , hjsmin == 0.1.0 , http-conduit == 1.4.1.2 , http-date == 0.0.2 , http-types == 0.6.10 - , language-javascript == 0.5.1 + , language-javascript == 0.5.2 , largeword == 1.0.1 - , lifted-base == 0.1.0.3 + , lifted-base == 0.1.0.4 , mime-mail == 0.4.1.1 - , monad-control == 0.3.1.1 - , mtl == 2.0.1.0 + , monad-control == 0.3.1.2 , network-conduit == 0.4.0 , path-pieces == 0.1.1 - , pem == 0.1.0 - , persistent == 0.9.0.2 + , pem == 0.1.1 + , persistent == 0.9.0.3 , persistent-template == 0.9.0.1 , pool-conduit == 0.1.0.1 , primitive == 0.4.1 @@ -83,16 +83,14 @@ library , shakespeare-js == 1.0.0.1 , shakespeare-text == 1.0.0.1 , simple-sendfile == 0.2.3 - , skein == 0.1.0.5 + , skein == 0.1.0.7 , socks == 0.4.1 , stm == 2.3 , system-filepath == 0.4.6 - , tagged == 0.2.3 + , tagged == 0.4.2 , tagsoup == 0.12.6 - , text == 0.11.2.0 - , tls == 0.9.3 - , tls-extra == 0.4.5 - , transformers == 0.2.2.0 + , tls == 0.9.5 + , tls-extra == 0.4.6 , transformers-base == 0.4.1 , unix-compat == 0.3.0.1 , unordered-containers == 0.2.1.0 @@ -102,7 +100,7 @@ library , vector == 0.9.1 , void == 0.5.5.1 , wai == 1.2.0.1 - , wai-app-static == 1.2.0.1 + , wai-app-static == 1.2.0.2 , wai-extra == 1.2.0.3 , wai-logger == 0.1.4 , warp == 1.2.0.1 @@ -110,11 +108,11 @@ library , xml-types == 0.3.1 , xss-sanitize == 0.3.1.1 , yaml == 0.7.0 - , yesod == 1.0.1.1 - , yesod-auth == 1.0.1 - , yesod-core == 1.0.1 + , yesod == 1.0.1.2 + , yesod-auth == 1.0.2 + , yesod-core == 1.0.1.1 , yesod-default == 1.0.1 - , yesod-form == 1.0.0.2 + , yesod-form == 1.0.0.3 , yesod-json == 1.0.0 , yesod-persistent == 1.0.0 , yesod-routes == 1.0.1 diff --git a/yesod-test/Yesod/Test/TransversingCSS.hs b/yesod-test/Yesod/Test/TransversingCSS.hs index b74bb129..28c1558a 100644 --- a/yesod-test/Yesod/Test/TransversingCSS.hs +++ b/yesod-test/Yesod/Test/TransversingCSS.hs @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} {- | This module uses HXT to transverse an HTML document using CSS selectors. @@ -45,8 +46,13 @@ import Control.Applicative ((<$>), (<*>)) import Text.XML import Text.XML.Cursor import qualified Data.ByteString.Lazy as L +#if MIN_VERSION_blaze_html(0, 5, 0) +import Text.Blaze.Html (toHtml) +import Text.Blaze.Html.Renderer.String (renderHtml) +#else import Text.Blaze (toHtml) import Text.Blaze.Renderer.String (renderHtml) +#endif import Text.XML.Xml2Html () type Query = T.Text diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index e9f9054a..c1d972b9 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -1,9 +1,9 @@ name: yesod-test -version: 0.2.0 +version: 0.2.0.1 license: MIT license-file: LICENSE author: Nubis -maintainer: Nubis +maintainer: Nubis , Michael Snoyman synopsis: integration testing for WAI/Yesod Applications category: Web, Yesod, Testing stability: Experimental @@ -15,6 +15,11 @@ extra-source-files: README.md, LICENSE flag ghc7 +flag blaze_html_0_5 + description: use blaze-html 0.5 and blaze-markup 0.5 + default: False + + library if flag(ghc7) build-depends: base >= 4.3 && < 5 @@ -40,8 +45,16 @@ library , xml-conduit >= 0.7 && < 0.8 , xml-types >= 0.3 && < 0.4 , containers - , blaze-html >= 0.4 && < 0.5 , xml2html >= 0.1.2 && < 0.2 + + if flag(blaze_html_0_5) + build-depends: + blaze-html >= 0.5 && < 0.6 + , blaze-markup >= 0.5.1 && < 0.6 + else + build-depends: + blaze-html >= 0.4 && < 0.5 + exposed-modules: Yesod.Test Yesod.Test.CssQuery Yesod.Test.TransversingCSS