diff --git a/full-test.sh b/full-test.sh new file mode 100755 index 00000000..30978f1e --- /dev/null +++ b/full-test.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +cabal clean && cabal install && rm -rf foobar && \ + yesod < input-sqlite && cd foobar && cabal install && cd .. && \ + yesod < input-postgres && cd foobar && cabal install && cd .. && \ + # yesod < input-mini && cd foobar && cabal install && cd .. && \ + rm -rf foobar diff --git a/input-mini b/input-mini new file mode 100644 index 00000000..61f2e8be --- /dev/null +++ b/input-mini @@ -0,0 +1,5 @@ +Michael +foobar + +Foobar +m diff --git a/input-postgres b/input-postgres new file mode 100644 index 00000000..0bd04d5a --- /dev/null +++ b/input-postgres @@ -0,0 +1,5 @@ +Michael +foobar + +Foobar +p diff --git a/input-sqlite b/input-sqlite new file mode 100644 index 00000000..af3132a8 --- /dev/null +++ b/input-sqlite @@ -0,0 +1,5 @@ +Michael +foobar + +Foobar +s diff --git a/scaffold/StaticFiles_hs.cg b/scaffold/StaticFiles_hs.cg index 40178be5..1de80de6 100644 --- a/scaffold/StaticFiles_hs.cg +++ b/scaffold/StaticFiles_hs.cg @@ -1,6 +1,6 @@ {-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-} module StaticFiles where -import Yesod + import Yesod.Helpers.Static -- | This generates easy references to files in the static directory at compile time. diff --git a/scaffold/cabal.cg b/scaffold/cabal.cg index 179849aa..808d7331 100644 --- a/scaffold/cabal.cg +++ b/scaffold/cabal.cg @@ -30,7 +30,7 @@ executable ~project~-test , bytestring , text , persistent - , persistent-~lower~ + , persistent-~lower~ >= 0.4 && < 0.5 , template-haskell , hamlet , web-routes diff --git a/yesod.cabal b/yesod.cabal index b1aff4e2..33f74f03 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 0.7.2 +version: 0.7.3 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -34,10 +34,10 @@ library , transformers >= 0.2 && < 0.3 , wai >= 0.3 && < 0.4 , wai-extra >= 0.3.2 && < 0.4 - , hamlet >= 0.7.1 && < 0.8 - , warp >= 0.3.2.1 && < 0.4 + , hamlet >= 0.7.3 && < 0.8 + , warp >= 0.3.3 && < 0.4 , mime-mail >= 0.1.0.1 && < 0.2 - , hjsmin >= 0.0.12 && < 0.1 + , hjsmin >= 0.0.13 && < 0.1 exposed-modules: Yesod ghc-options: -Wall