From 598e57091388cb60cbabab0e7746e59972ddb423 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 7 Sep 2014 17:41:09 +0300 Subject: [PATCH] Remove deprecated packages --- yesod-bin/yesod-bin.cabal | 9 ++------- yesod-core/yesod-core.cabal | 18 ++++-------------- yesod-form/yesod-form.cabal | 5 +---- yesod-newsfeed/yesod-newsfeed.cabal | 3 +-- yesod-test/yesod-test.cabal | 3 +-- yesod/yesod.cabal | 4 ---- 6 files changed, 9 insertions(+), 33 deletions(-) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 5952d4f3..20a821a3 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -51,11 +51,7 @@ executable yesod , ghc-paths >= 0.1 , parsec >= 2.1 && < 4 , text >= 0.11 - , shakespeare - , shakespeare-text >= 1.0 - , shakespeare >= 1.0.2 && < 2.1 - , shakespeare-js >= 1.0.2 - , shakespeare-css >= 1.0.2 + , shakespeare >= 2.0 , bytestring >= 0.9.1.4 , time >= 1.1.4 , template-haskell @@ -78,7 +74,7 @@ executable yesod , fsnotify >= 0.0 && < 0.2 , split >= 0.2 && < 0.3 , file-embed - , conduit >= 0.5 && < 1.3 + , conduit >= 1.2 , conduit-extra , resourcet >= 0.3 && < 1.2 , base64-bytestring @@ -86,7 +82,6 @@ executable yesod , http-reverse-proxy >= 0.1.1 , network , http-conduit - , network-conduit , project-template >= 0.1.1 , transformers , warp >= 1.3.7.5 diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 7836fa73..dae69489 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -25,17 +25,13 @@ extra-source-files: library build-depends: base >= 4.3 && < 5 , time >= 1.1.4 - , wai >= 1.4 - , wai-extra >= 1.3 + , wai >= 3.0 + , wai-extra >= 3.0 , bytestring >= 0.9.1.4 , text >= 0.7 , template-haskell , path-pieces >= 0.1.2 && < 0.2 - , hamlet >= 1.1 - , shakespeare >= 1.0 && < 2.1 - , shakespeare-js >= 1.0.2 - , shakespeare-css >= 1.0 - , shakespeare-i18n >= 1.0 + , shakespeare >= 2.0 , blaze-builder >= 0.2.1.4 && < 0.4 , transformers >= 0.2.2 , mtl @@ -56,10 +52,9 @@ library , fast-logger >= 0.2 , wai-logger >= 0.2 , monad-logger >= 0.3.1 && < 0.4 - , conduit >= 1.0.11 + , conduit >= 1.2 , resourcet >= 0.4.9 && < 1.2 , lifted-base >= 0.1.2 - , attoparsec-conduit , blaze-html >= 0.5 , blaze-markup >= 0.5.1 , data-default @@ -135,13 +130,9 @@ test-suite tests cpp-options: -DTEST build-depends: base ,hspec >= 1.3 - ,wai-test >= 1.3.0.5 ,wai >= 3.0 ,yesod-core ,bytestring - ,hamlet - ,shakespeare-css - ,shakespeare-js ,text ,http-types , random @@ -170,7 +161,6 @@ benchmark widgets , criterion , bytestring , text - , hamlet , transformers , yesod-core , blaze-html diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index ed539e9e..3114c282 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -21,10 +21,7 @@ library , yesod-core >= 1.2 && < 1.3 , yesod-persistent >= 1.2 && < 1.3 , time >= 1.1.4 - , hamlet >= 1.1.8 - , shakespeare - , shakespeare-css >= 1.0 - , shakespeare-js >= 1.0.2 + , shakespeare >= 2.0 , persistent , template-haskell , transformers >= 0.2.2 diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal index 5d20b9ad..2e6f9109 100644 --- a/yesod-newsfeed/yesod-newsfeed.cabal +++ b/yesod-newsfeed/yesod-newsfeed.cabal @@ -16,8 +16,7 @@ library build-depends: base >= 4 && < 5 , yesod-core >= 1.2 && < 1.3 , time >= 1.1.4 - , hamlet >= 1.1 - , shakespeare + , shakespeare >= 2.0 , bytestring >= 0.9.1.4 , text >= 0.9 , xml-conduit >= 1.0 diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 02400a24..102d4e1d 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -18,8 +18,7 @@ library , attoparsec >= 0.10 , persistent >= 1.0 , transformers >= 0.2.2 - , wai >= 1.3 - , wai-test >= 1.3 + , wai >= 3.0 , wai-extra , network >= 2.2 , http-types >= 0.7 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 54a5bf7d..f109eee4 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -30,16 +30,12 @@ library , transformers >= 0.2.2 , wai >= 1.3 , wai-extra >= 1.3 - , hamlet >= 1.1 - , shakespeare-js >= 1.0.2 - , shakespeare-css >= 1.0 , warp >= 1.3 , blaze-html >= 0.5 , blaze-markup >= 0.5.1 , aeson , safe , data-default - , network-conduit , unordered-containers , yaml , text