diff --git a/.version b/.version index 061a564dc..e71519696 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.15.99 +1.16 diff --git a/Shake.hs b/Shake.hs index 18edec950..30b1031b4 100755 --- a/Shake.hs +++ b/Shake.hs @@ -158,7 +158,7 @@ main = do let -- documentation versions shown on the website - docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12", "1.13", "1.14", "1.15" ] + docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12", "1.13", "1.14", "1.15", "1.16" ] -- main package names, in standard build order packages = [ diff --git a/doc/common.m4 b/doc/common.m4 index 7b1e6efd1..9a997f766 100644 --- a/doc/common.m4 +++ b/doc/common.m4 @@ -24,8 +24,8 @@ m4_dnl Links to dev and recent release versions of a manual. m4_dnl The actual links are inserted dynamically by site.js, static generation was much too painful. m4_dnl There should be a " (dev)" suffix here except when generating release docs. m4_define({{_docversionlinks_}},m4_dnl -This doc is for version **_version_** (dev) -m4_dnl comment (dev) for releases, uncomment between releases: +This doc is for version **_version_** +m4_dnl (dev) suffix should be commented for releases, uncommented in between releases: m4_dnl (dev) . m4_dnl m4_dnl diff --git a/hledger-lib/.version b/hledger-lib/.version index ca6ebbc36..03ff89716 100644 --- a/hledger-lib/.version +++ b/hledger-lib/.version @@ -1 +1 @@ -1.15.99 \ No newline at end of file +1.16 \ No newline at end of file diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index cfc8c4dbe..1ba870b60 100644 --- a/hledger-lib/defs.m4 +++ b/hledger-lib/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl m4_dnl Program version. Updated by make setversion. -m4_define({{_version_}}, {{1.15.99}})m4_dnl +m4_define({{_version_}}, {{1.16}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{September 2019}})m4_dnl diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 0a9ddfc46..cd57ac0bb 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: 1.15.99 +version: 1.16 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/.version b/hledger-ui/.version index ca6ebbc36..03ff89716 100644 --- a/hledger-ui/.version +++ b/hledger-ui/.version @@ -1 +1 @@ -1.15.99 \ No newline at end of file +1.16 \ No newline at end of file diff --git a/hledger-ui/defs.m4 b/hledger-ui/defs.m4 index 59e5203ff..dae2f8b90 100644 --- a/hledger-ui/defs.m4 +++ b/hledger-ui/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl m4_dnl Program version. Updated by make setversion. -m4_define({{_version_}}, {{1.15.99}})m4_dnl +m4_define({{_version_}}, {{1.16}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index d1df41d18..9de430815 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : 1.15.99 +version : 1.16 synopsis : Terminal user interface for the hledger accounting tool description : | This is hledger's terminal interface. @@ -37,11 +37,11 @@ flags: manual: false default: true -cpp-options: -DVERSION="1.15.99" +cpp-options: -DVERSION="1.16" dependencies: -- hledger-lib >=1.15.99 && <1.16 -- hledger >=1.15.99 && <1.16 +- hledger-lib >=1.16 && <1.17 +- hledger >=1.16 && <1.17 - ansi-terminal >=0.6.2.3 - async - base >=4.9 && <4.14 diff --git a/hledger-web/.version b/hledger-web/.version index ca6ebbc36..03ff89716 100644 --- a/hledger-web/.version +++ b/hledger-web/.version @@ -1 +1 @@ -1.15.99 \ No newline at end of file +1.16 \ No newline at end of file diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index 59e5203ff..dae2f8b90 100644 --- a/hledger-web/defs.m4 +++ b/hledger-web/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl m4_dnl Program version. Updated by make setversion. -m4_define({{_version_}}, {{1.15.99}})m4_dnl +m4_define({{_version_}}, {{1.16}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 54a2ab6de..4cf929d1b 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: 1.15.99 +version: 1.16 synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -77,7 +77,7 @@ when: library: source-dirs: . - cpp-options: -DVERSION="1.15.99" + cpp-options: -DVERSION="1.16" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -97,8 +97,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.15.99 && <1.16 - - hledger >=1.15.99 && <1.16 + - hledger-lib >=1.16 && <1.17 + - hledger >=1.16 && <1.17 - aeson - base >=4.9 && <4.14 - blaze-html @@ -143,7 +143,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.15.99" + cpp-options: -DVERSION="1.16" dependencies: - base - hledger-web @@ -159,7 +159,7 @@ executables: # source-dirs: test # main: test.hs # other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 -# cpp-options: -DVERSION="1.15.99" +# cpp-options: -DVERSION="1.16" # dependencies: # - base # - hledger-web diff --git a/hledger/.version b/hledger/.version index ca6ebbc36..03ff89716 100644 --- a/hledger/.version +++ b/hledger/.version @@ -1 +1 @@ -1.15.99 \ No newline at end of file +1.16 \ No newline at end of file diff --git a/hledger/defs.m4 b/hledger/defs.m4 index cfc8c4dbe..1ba870b60 100644 --- a/hledger/defs.m4 +++ b/hledger/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl m4_dnl Program version. Updated by make setversion. -m4_define({{_version_}}, {{1.15.99}})m4_dnl +m4_define({{_version_}}, {{1.16}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{September 2019}})m4_dnl diff --git a/hledger/package.yaml b/hledger/package.yaml index 54d48546a..cbb65fe04 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: 1.15.99 +version: 1.16 synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -105,7 +105,7 @@ ghc-options: - -optP-Wno-nonportable-include-path dependencies: -- hledger-lib >=1.15.99 && <1.16 +- hledger-lib >=1.16 && <1.17 - ansi-terminal >=0.6.2.3 - base >=4.9 && <4.14 - base-compat-batteries >=0.10.1 && <0.12 @@ -148,7 +148,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.15.99" + cpp-options: -DVERSION="1.16" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -196,7 +196,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.15.99" + cpp-options: -DVERSION="1.16" when: - condition: flag(threaded) ghc-options: -threaded @@ -208,7 +208,7 @@ tests: source-dirs: test main: unittest.hs other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 - cpp-options: -DVERSION="1.15.99" + cpp-options: -DVERSION="1.16" dependencies: - hledger