diff --git a/.version b/.version index d8e473814..d3456a90f 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.12.99 +1.13 diff --git a/Shake.hs b/Shake.hs index 6c446e783..a391d5f05 100755 --- a/Shake.hs +++ b/Shake.hs @@ -119,7 +119,7 @@ main = do let -- documentation versions shown on the website (excluding 0.27 which is handled specially) - docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12" ] + docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12", "1.13" ] -- main package names, in standard build order packages = [ diff --git a/doc/lib.m4 b/doc/lib.m4 index de63b07dd..8898583f1 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -7,8 +7,8 @@ m4_define({{_webseparate_}}, m4_ifdef({{WEB && SEPARATE}},{{$1}}) )m4_dnl m4_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl m4_dnl m4_define({{_author_}}, {{}})m4_dnl -m4_define({{_monthyear_}}, {{January 2019}})m4_dnl -m4_define({{_version_}}, {{1.12.99}})m4_dnl +m4_define({{_monthyear_}}, {{February 2019}})m4_dnl +m4_define({{_version_}}, {{1.13}})m4_dnl m4_dnl m4_dnl Links to dev and recent release versions of a manual. m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc. diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 9f42fcc87..3fdc1fbf8 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: d5f6287179b90ef98612ff82514942901b1f593256fb022d2ae727dee39eadd6 +-- hash: d466c16400216144122ec39c234f0b399daffb1a7eb48236b78b63ba59102275 name: hledger-api -version: 1.12.99 +version: 1.13 synopsis: Web API server for the hledger accounting tool description: This is a simple web API server for hledger data. It comes with a series of simple client-side web app examples. @@ -46,7 +46,7 @@ executable hledger-api other-modules: Paths_hledger_api ghc-options: -threaded - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: Decimal , aeson @@ -56,8 +56,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.12.99 && <1.13 - , hledger-lib >=1.12.99 && <1.13 + , hledger >=1.13 && <1.14 + , hledger-lib >=1.13 && <1.14 , microlens >=0.4 , microlens-platform >=0.2.3.1 , safe diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs index 2e0a4b98d..a5e45ea49 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -37,12 +37,12 @@ import Text.Printf import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.12.99" +hledgerApiVersion="1.13" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.12.99 +hledger-api 1.13 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index e4b382e1d..400110b75 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.12.99' +version: '1.13' synopsis: Web API server for the hledger accounting tool description: | This is a simple web API server for hledger data. @@ -32,8 +32,8 @@ extra-source-files: #data-files: dependencies: -- hledger-lib >=1.12.99 && <1.13 -- hledger >=1.12.99 && <1.13 +- hledger-lib >=1.13 && <1.14 +- hledger >=1.13 && <1.14 - base >=4.8 && <4.13 - aeson - bytestring @@ -58,4 +58,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 5439869cf..1877103af 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 83c1fff5c5877da9fe972db3b0b57fb31687fbdb4476b7ee0136e76a64e2f69e +-- hash: c17b44c345a89a13650ca3efcba7d7e8311e9312acfd08dff5f2716e70ca29d7 name: hledger-lib -version: 1.12.99 +version: 1.13 synopsis: Core data types, parsers and functionality for the hledger accounting tools description: This is a reusable library containing hledger's core functionality. . diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 66ebe84bc..e85c8e843 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.12.99' +version: '1.13' synopsis: Core data types, parsers and functionality for the hledger accounting tools description: | This is a reusable library containing hledger's core functionality. diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index c42d6d555..d5879cf2a 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 70e50e38529d67ced531e192d592b6812e9d74aee2b1dc15ebf4bc5d09476210 +-- hash: d833450b55016a44ba8764317be0644717747ee8c20a2b191f3700a3cb67e81c name: hledger-ui -version: 1.12.99 +version: 1.13 synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. It is simpler and more convenient for browsing data than the command-line interface, @@ -64,7 +64,7 @@ executable hledger-ui hs-source-dirs: ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: ansi-terminal >=0.6.2.3 , async @@ -76,8 +76,8 @@ executable hledger-ui , directory , filepath , fsnotify >=0.2.1.2 && <0.4 - , hledger >=1.12.99 && <1.13 - , hledger-lib >=1.12.99 && <1.13 + , hledger >=1.13 && <1.14 + , hledger-lib >=1.13 && <1.14 , megaparsec >=7.0.0 && <8 , microlens >=0.4 , microlens-platform >=0.2.3.1 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 7c1a8e379..31e5c8161 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.12.99' +version : '1.13' synopsis : Curses-style user interface for the hledger accounting tool description : | This is hledger's curses-style interface. @@ -37,11 +37,11 @@ flags: manual: false default: true -cpp-options: -DVERSION="1.12.99" +cpp-options: -DVERSION="1.13" dependencies: -- hledger >=1.12.99 && <1.13 -- hledger-lib >=1.12.99 && <1.13 +- hledger >=1.13 && <1.14 +- hledger-lib >=1.13 && <1.14 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.13 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index acc28aabe..00652223f 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 2daa17177b7cd919f708bbca4a81a1171bb51f9ba64055c7095c1fe470b7b19c +-- hash: b8f9535cea480d164624211cb8b2a0e0cfc7876b3c2c38539c62fe21ef588d14 name: hledger-web -version: 1.12.99 +version: 1.13 synopsis: Web interface for the hledger accounting tool description: This is hledger's web interface. It provides a more user-friendly and collaborative UI than the @@ -150,7 +150,7 @@ library hs-source-dirs: ./. ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: base >=4.8 && <4.13 , blaze-html @@ -165,8 +165,8 @@ library , directory , filepath , hjsmin - , hledger >=1.12.99 && <1.13 - , hledger-lib >=1.12.99 && <1.13 + , hledger >=1.13 && <1.14 + , hledger-lib >=1.13 && <1.14 , http-client , http-conduit , json @@ -206,7 +206,7 @@ executable hledger-web hs-source-dirs: app ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 0debfe529..9e9c69477 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.12.99' +version: '1.13' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -79,7 +79,7 @@ when: library: source-dirs: . - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -98,8 +98,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.12.99 && <1.13 - - hledger >=1.12.99 && <1.13 + - hledger-lib >=1.13 && <1.14 + - hledger >=1.13 && <1.14 - base >=4.8 && <4.13 - blaze-html - blaze-markup @@ -145,7 +145,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" dependencies: - base - hledger-web @@ -162,7 +162,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.12.99" +# cpp-options: -DVERSION="1.13" # dependencies: # - base # - hledger-web diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 0efd9f044..9ccf32c10 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 14d0eb516133f56c0d466c15ab014ce4e7d3b63a641b1ad70de250a2930e8784 +-- hash: 0f31726cb805b74d59400bb1d7502bb6c6c7f01eb41ac0272c4da6a8d94144b2 name: hledger -version: 1.12.99 +version: 1.13 synopsis: Command-line interface for the hledger accounting tool description: This is hledger's command-line interface. Its basic function is to read a plain text file describing @@ -136,7 +136,7 @@ library other-modules: Paths_hledger ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: Decimal , Diff @@ -153,7 +153,7 @@ library , hashable >=1.2.4 , haskeline >=0.6 , here - , hledger-lib >=1.12.99 && <1.13 + , hledger-lib >=1.13 && <1.14 , lucid , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 @@ -188,7 +188,7 @@ executable hledger hs-source-dirs: app ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -204,7 +204,7 @@ executable hledger , haskeline >=0.6 , here , hledger - , hledger-lib >=1.12.99 && <1.13 + , hledger-lib >=1.13 && <1.14 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -241,7 +241,7 @@ test-suite test hs-source-dirs: test ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -257,7 +257,7 @@ test-suite test , haskeline >=0.6 , here , hledger - , hledger-lib >=1.12.99 && <1.13 + , hledger-lib >=1.13 && <1.14 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -310,7 +310,7 @@ benchmark bench , haskeline >=0.6 , here , hledger - , hledger-lib >=1.12.99 && <1.13 + , hledger-lib >=1.13 && <1.14 , html , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 diff --git a/hledger/package.yaml b/hledger/package.yaml index f5b23a961..5963302e1 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.12.99' +version: '1.13' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -103,7 +103,7 @@ ghc-options: - -optP-Wno-nonportable-include-path dependencies: -- hledger-lib >=1.12.99 && <1.13 +- hledger-lib >=1.13 && <1.14 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 @@ -145,7 +145,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -187,7 +187,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" when: - condition: flag(threaded) ghc-options: -threaded @@ -198,7 +198,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.12.99" + cpp-options: -DVERSION="1.13" dependencies: - hledger - test-framework