From 4ff2635bf8d5a6ddb64d2f9621653abaa78f2d85 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 14 May 2013 10:30:46 -0700 Subject: [PATCH] bump version to 0.20.98 (0.21 alpha) --- MANUAL.md | 2 +- NEWS.md | 2 + VERSION | 2 +- hledger-lib/hledger-lib.cabal | 2 +- hledger-web/hledger-web.cabal | 270 +++++++++++++++++----------------- hledger/hledger.cabal | 10 +- 6 files changed, 145 insertions(+), 143 deletions(-) diff --git a/MANUAL.md b/MANUAL.md index 1f628fd35..a482bbb95 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -4,7 +4,7 @@ title: hledger user manual # User manual -For: hledger 0.20 +For: hledger 0.21 alpha ## Introduction diff --git a/NEWS.md b/NEWS.md index 09d64a6f2..5fce0e117 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,8 @@ title: hledger news # News + + ## 2013/5/4 hledger 0.20.0.1 * web: require at least version 1.1.7 of yesod-core to avoid a potential build error diff --git a/VERSION b/VERSION index 3090f8f80..97ad504ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.20.0.1 +0.20.98 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index c5267bc5c..50ff6c8ac 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -1,5 +1,5 @@ name: hledger-lib -version: 0.20.0.1 +version: 0.20.98 category: Finance synopsis: Core data types, parsers and utilities for the hledger accounting tool. description: diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 8070695dc..944d66c50 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,6 +1,6 @@ name: hledger-web -- also in cpp-options below -version: 0.20.0.1 +version: 0.20.98 category: Finance synopsis: A web interface for the hledger accounting tool. description: @@ -99,7 +99,7 @@ library -- Buildable: False ghc-options: -Wall -fno-warn-unused-do-bind - cpp-options: -DVERSION="0.20.0.1" + cpp-options: -DVERSION="0.20.98" if flag(dev) || flag(library-only) cpp-options: -DDEVELOPMENT @@ -118,31 +118,31 @@ library RecordWildCards build-depends: base >= 4 && < 5 - -- , yesod-platform >= 1.1 && < 1.2 - , yesod >= 1.1.3 && < 1.2 - , yesod-core >= 1.1.7 && < 1.2 - , yesod-static >= 1.1 && < 1.2 - , yesod-default >= 1.1 && < 1.2 - , yesod-form >= 1.1 && < 1.3 - , clientsession - , bytestring >= 0.9 && < 0.11 - , text >= 0.11 && < 0.12 - , template-haskell - , hamlet >= 1.1 && < 1.2 - , shakespeare-css >= 1.0 && < 1.1 - , shakespeare-js >= 1.0 && < 1.2 - , shakespeare-text >= 1.0 && < 1.1 - , hjsmin >= 0.1 && < 0.2 - , monad-control >= 0.3 && < 0.4 - , wai-extra >= 1.3 && < 1.4 - , yaml >= 0.8 && < 0.9 - , http-conduit >= 1.8 && < 1.10 - , directory >= 1.1 && < 1.3 - , warp >= 1.3 && < 1.4 - , data-default + , yesod-platform >= 1.2 && < 1.3 + -- , yesod >= 1.1.3 && < 1.2 + -- , yesod-core >= 1.1.7 && < 1.2 + -- , yesod-static >= 1.1 && < 1.2 + -- , yesod-default >= 1.1 && < 1.2 + -- , yesod-form >= 1.1 && < 1.3 + -- , clientsession + -- , bytestring >= 0.9 && < 0.11 + -- , text >= 0.11 && < 0.12 + -- , template-haskell + -- , hamlet >= 1.1 && < 1.2 + -- , shakespeare-css >= 1.0 && < 1.1 + -- , shakespeare-js >= 1.0 && < 1.2 + -- , shakespeare-text >= 1.0 && < 1.1 + -- , hjsmin >= 0.1 && < 0.2 + -- , monad-control >= 0.3 && < 0.4 + -- , wai-extra >= 1.3 && < 1.4 + -- , yaml >= 0.8 && < 0.9 + -- , http-conduit >= 1.8 && < 1.10 + -- , directory >= 1.1 && < 1.3 + -- , warp >= 1.3 && < 1.4 + -- , data-default - , hledger == 0.20.0.1 - , hledger-lib == 0.20.0.1 + , hledger == 0.20.98 + , hledger-lib == 0.20.98 , cmdargs >= 0.10 && < 0.11 , directory , filepath @@ -160,118 +160,118 @@ library , warp , yaml - if flag(blaze_html_0_4) - cpp-options: -DBLAZE_HTML_0_4 - build-depends: - blaze-html >= 0.4 && < 0.5 - else - build-depends: - blaze-html >= 0.5 && < 0.7 - , blaze-markup >= 0.5.1 && < 0.7 - - -executable hledger-web - cpp-options: -DVERSION="0.20.0.1" - - if flag(library-only) - Buildable: False - - if flag(dev) - cpp-options: -DDEVELOPMENT - ghc-options: -O0 -Wall -fno-warn-unused-do-bind - else - ghc-options: -O2 -Wall -fno-warn-unused-do-bind - - if flag(threaded) - ghc-options: -threaded - - extensions: TemplateHaskell - QuasiQuotes - OverloadedStrings - NoImplicitPrelude - CPP - OverloadedStrings - MultiParamTypeClasses - TypeFamilies - RecordWildCards - - hs-source-dirs: . app - - main-is: main.hs - other-modules: - Application - Foundation - Import - Settings - Settings.StaticFiles - Settings.Development - Handler.Common - Handler.JournalEditR - Handler.JournalEntriesR - Handler.JournalR - Handler.Post - Handler.RegisterR - Handler.RootR - Handler.Utils - Hledger.Web - Hledger.Web.Main - Hledger.Web.Options - + -- if flag(blaze_html_0_4) + -- cpp-options: -DBLAZE_HTML_0_4 + -- build-depends: + -- blaze-html >= 0.4 && < 0.5 + -- else build-depends: - hledger-web - , hledger == 0.20.0.1 - , hledger-lib == 0.20.0.1 - , base >= 4.3 && < 5 - , cmdargs >= 0.10 && < 0.11 - , directory - , filepath - , HUnit - , old-locale - , parsec - , regexpr >= 0.5.1 - , safe >= 0.2 - , time - - -- , yesod-platform == 1.1.* - , yesod >= 1.1.3 && < 1.2 - , yesod-core >= 1.1.7 && < 1.2 - , yesod-default - , yesod-static - , clientsession - , hamlet - , network-conduit - , shakespeare-text - , template-haskell - , text - , transformers - , wai - , wai-extra - , wai-handler-launch >= 1.3 && < 1.4 - , warp - , yaml - , hjsmin >= 0.1 && < 0.2 - , http-conduit >= 1.8 && < 1.10 - , data-default - - if flag(blaze_html_0_4) - cpp-options: -DBLAZE_HTML_0_4 - build-depends: - blaze-html >= 0.4 && < 0.5 - else - build-depends: blaze-html >= 0.5 && < 0.7 , blaze-markup >= 0.5.1 && < 0.7 -test-suite test - type: exitcode-stdio-1.0 - main-is: main.hs - hs-source-dirs: tests - ghc-options: -Wall +-- executable hledger-web +-- cpp-options: -DVERSION="0.20.98" - build-depends: - base - , hledger-web - , yesod-test >= 0.3 && < 0.4 - , yesod-default - , yesod-core >= 1.1.7 && < 1.2 +-- if flag(library-only) +-- Buildable: False + +-- if flag(dev) +-- cpp-options: -DDEVELOPMENT +-- ghc-options: -O0 -Wall -fno-warn-unused-do-bind +-- else +-- ghc-options: -O2 -Wall -fno-warn-unused-do-bind + +-- if flag(threaded) +-- ghc-options: -threaded + +-- extensions: TemplateHaskell +-- QuasiQuotes +-- OverloadedStrings +-- NoImplicitPrelude +-- CPP +-- OverloadedStrings +-- MultiParamTypeClasses +-- TypeFamilies +-- RecordWildCards + +-- hs-source-dirs: . app + +-- main-is: main.hs +-- other-modules: +-- Application +-- Foundation +-- Import +-- Settings +-- Settings.StaticFiles +-- Settings.Development +-- Handler.Common +-- Handler.JournalEditR +-- Handler.JournalEntriesR +-- Handler.JournalR +-- Handler.Post +-- Handler.RegisterR +-- Handler.RootR +-- Handler.Utils +-- Hledger.Web +-- Hledger.Web.Main +-- Hledger.Web.Options + +-- build-depends: +-- hledger-web +-- , hledger == 0.20.0.1 +-- , hledger-lib == 0.20.0.1 +-- , base >= 4.3 && < 5 +-- , cmdargs >= 0.10 && < 0.11 +-- , directory +-- , filepath +-- , HUnit +-- , old-locale +-- , parsec +-- , regexpr >= 0.5.1 +-- , safe >= 0.2 +-- , time + +-- -- , yesod-platform == 1.1.* +-- , yesod >= 1.1.3 && < 1.2 +-- , yesod-core >= 1.1.7 && < 1.2 +-- , yesod-default +-- , yesod-static +-- , clientsession +-- , hamlet +-- , network-conduit +-- , shakespeare-text +-- , template-haskell +-- , text +-- , transformers +-- , wai +-- , wai-extra +-- , wai-handler-launch >= 1.3 && < 1.4 +-- , warp +-- , yaml +-- , hjsmin >= 0.1 && < 0.2 +-- , http-conduit >= 1.8 && < 1.10 +-- , data-default + +-- if flag(blaze_html_0_4) +-- cpp-options: -DBLAZE_HTML_0_4 +-- build-depends: +-- blaze-html >= 0.4 && < 0.5 +-- else +-- build-depends: +-- blaze-html >= 0.5 && < 0.7 +-- , blaze-markup >= 0.5.1 && < 0.7 + + +-- test-suite test +-- type: exitcode-stdio-1.0 +-- main-is: main.hs +-- hs-source-dirs: tests +-- ghc-options: -Wall + +-- build-depends: +-- base +-- , hledger-web +-- , yesod-test >= 0.3 && < 0.4 +-- , yesod-default +-- , yesod-core >= 1.1.7 && < 1.2 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 49f17c603..cb6374832 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -1,6 +1,6 @@ name: hledger -- also in cpp-options below -version: 0.20.0.1 +version: 0.20.98 category: Finance synopsis: The main command-line interface for the hledger accounting tool. description: @@ -41,7 +41,7 @@ flag threaded Default: True library - cpp-options: -DVERSION="0.20.0.1" + cpp-options: -DVERSION="0.20.98" ghc-options: -W -- should be the same as below exposed-modules: @@ -62,7 +62,7 @@ library Hledger.Cli.Stats -- should be the same as below build-depends: - hledger-lib == 0.20.0.1 + hledger-lib == 0.20.98 ,base >= 4.3 && < 5 -- ,cabal-file-th ,containers @@ -110,13 +110,13 @@ executable hledger Hledger.Cli.Print Hledger.Cli.Register Hledger.Cli.Stats - cpp-options: -DVERSION="0.20.0.1" + cpp-options: -DVERSION="0.20.98" ghc-options: -W if flag(threaded) ghc-options: -threaded -- should be the same as above build-depends: - hledger-lib == 0.20.0.1 + hledger-lib == 0.20.98 ,base >= 4.3 && < 5 ,containers ,cmdargs >= 0.10 && < 0.11