diff --git a/.version b/.version index c96cc17e8..2e0e38c63 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5.99 +1.9 diff --git a/doc/lib.m4 b/doc/lib.m4 index 74cb98029..3fa61c5eb 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 2018}})m4_dnl -m4_define({{_version_}}, {{1.5.99}})m4_dnl +m4_define({{_monthyear_}}, {{March 2018}})m4_dnl +m4_define({{_version_}}, {{1.9}})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. @@ -20,6 +20,7 @@ This doc is for version **_version_ (dev)**. m4_dnl Too painful for static generation, insert from site.js instead m4_dnl Available versions: m4_dnl dev +m4_dnl | 1.9 m4_dnl | 1.5 m4_dnl | 1.4 m4_dnl | 1.3 diff --git a/hledger-api/CHANGES b/hledger-api/CHANGES index 827bd634f..df5477986 100644 --- a/hledger-api/CHANGES +++ b/hledger-api/CHANGES @@ -1,7 +1,7 @@ User-visible changes in hledger-api. See also hledger, hledger-lib. -# 1.6 (2018/3/31) +# 1.9 (2018/3/31) * support ghc 8.4, latest deps diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs index 5d57a051a..50d31c8b3 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -36,12 +36,12 @@ import Text.Printf import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.5.99" +hledgerApiVersion="1.9" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.5.99 +hledger-api 1.9 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index ea30b7555..478becacd 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.5.99' +version: '1.9' 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.5.99 && <1.6 -- hledger >=1.5.99 && <1.6 +- hledger-lib >=1.9 && <2.0 +- hledger >=1.9 && <2.0 - base >=4.8 && <4.12 - aeson - bytestring @@ -57,4 +57,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" diff --git a/hledger-lib/CHANGES b/hledger-lib/CHANGES index 72d1b66fb..e405da75b 100644 --- a/hledger-lib/CHANGES +++ b/hledger-lib/CHANGES @@ -2,7 +2,7 @@ API-ish changes in the hledger-lib package. Most user-visible changes are noted in the hledger changelog, instead. -# 1.6 (2018/3/31) +# 1.9 (2018/3/31) * support ghc 8.4, latest deps diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index efbcc1940..1b99625b2 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.5.99' +version: '1.9' 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/CHANGES b/hledger-ui/CHANGES index bdc8991fe..ae6ba991a 100644 --- a/hledger-ui/CHANGES +++ b/hledger-ui/CHANGES @@ -1,7 +1,7 @@ User-visible changes in hledger-ui. See also hledger, hledger-lib. -# 1.6 (2018/3/31) +# 1.9 (2018/3/31) * support ghc 8.4, latest deps diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 17a3084e7..4f4607024 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.5.99' +version : '1.9' 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.5.99" +cpp-options: -DVERSION="1.9" dependencies: - - hledger >=1.5.99 && <1.6 - - hledger-lib >=1.5.99 && <1.6 + - hledger >=1.9 && <2.0 + - hledger-lib >=1.9 && <2.0 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.12 diff --git a/hledger-web/CHANGES b/hledger-web/CHANGES index 294096e39..468f009b3 100644 --- a/hledger-web/CHANGES +++ b/hledger-web/CHANGES @@ -1,7 +1,7 @@ User-visible changes in hledger-web. See also hledger, hledger-lib. -# 1.6 (2018/3/31) +# 1.9 (2018/3/31) * support ghc 8.4, latest deps diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index a389af684..1d2a164fe 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.5.99' +version: '1.9' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -62,8 +62,8 @@ flags: default: true dependencies: -- hledger-lib >=1.5.99 && <1.6 -- hledger >=1.5.99 && <1.6 +- hledger-lib >=1.9 && <2.0 +- hledger >=1.9 && <2.0 - base >=4.8 && <4.12 - base-compat >=0.8.1 - blaze-html @@ -114,7 +114,7 @@ ghc-options: - -fno-warn-orphans library: - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" exposed-modules: - Application - Foundation @@ -137,7 +137,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" dependencies: - hledger-web when: @@ -150,7 +150,7 @@ tests: test: source-dirs: tests main: main.hs - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" dependencies: - hledger-web - hspec diff --git a/hledger/CHANGES b/hledger/CHANGES index 36fc2598f..fa2e7d551 100644 --- a/hledger/CHANGES +++ b/hledger/CHANGES @@ -1,7 +1,7 @@ User-visible changes in the hledger command line tool. -# 1.6 (2018/3/31) +# 1.9 (2018/3/31) * support ghc 8.4, latest deps diff --git a/hledger/package.yaml b/hledger/package.yaml index a4fc9b4d6..29d2cd130 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.5.99' +version: '1.9' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -92,7 +92,7 @@ dependencies: - tabular >=0.2 - time >=1.5 - utility-ht >=0.0.13 -- hledger-lib >=1.5.99 && <1.6 +- hledger-lib >=1.9 && <2.0 when: - condition: (!(os(windows))) && (flag(terminfo)) @@ -100,7 +100,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -161,7 +161,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" when: - condition: flag(threaded) ghc-options: -threaded @@ -191,7 +191,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.5.99" + cpp-options: -DVERSION="1.9" dependencies: - hledger - bytestring diff --git a/site/js/site.js b/site/js/site.js index 3c526c124..73deb7235 100644 --- a/site/js/site.js +++ b/site/js/site.js @@ -12,6 +12,7 @@ function addDocVersions() { var newpage = page=='manual' ? page : topic; $('.docversions').html('Available versions: \ dev \ +| 1.9 \ | 1.5 \ | 1.4 \ | 1.3 \