diff --git a/.version b/.version index 41c11ffb7..578fe8324 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.16.1 +1.16.99 diff --git a/doc/common.m4 b/doc/common.m4 index c1a1ff5f5..93185a614 100644 --- a/doc/common.m4 +++ b/doc/common.m4 @@ -25,8 +25,8 @@ m4_dnl The actual links are inserted dynamically by site.js, static generation w 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_** -m4_dnl (dev) suffix should be commented for releases, uncommented in between releases: -m4_dnl (dev) +m4_dnl (dev) suffix below should be commented for releases, uncommented in between releases: +(dev) . m4_dnl m4_dnl m4_dnl diff --git a/hledger-lib/.version b/hledger-lib/.version index bbb75a1b6..b152d15c0 100644 --- a/hledger-lib/.version +++ b/hledger-lib/.version @@ -1 +1 @@ -1.16.1 \ No newline at end of file +1.16.99 \ No newline at end of file diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index 443f5f124..f04f2f0be 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.16.1}})m4_dnl +m4_define({{_version_}}, {{1.16.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{December 2019}})m4_dnl +m4_define({{_monthyear_}}, {{January 2020}})m4_dnl diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 7490b50dc..38117b648 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: c470aed5e036160325eaec9264fbff17a3dcbe8a41728d7b661c014105fe0419 +-- hash: 7338b387492cf1c078ae62d4f4c50859589b0a5549943203856880918b67d202 name: hledger-lib -version: 1.16.1 +version: 1.16.99 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 a1e9ec4e4..f9d4b48b8 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: 1.16.1 +version: 1.16.99 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 bbb75a1b6..b152d15c0 100644 --- a/hledger-ui/.version +++ b/hledger-ui/.version @@ -1 +1 @@ -1.16.1 \ No newline at end of file +1.16.99 \ No newline at end of file diff --git a/hledger-ui/defs.m4 b/hledger-ui/defs.m4 index 443f5f124..f04f2f0be 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.16.1}})m4_dnl +m4_define({{_version_}}, {{1.16.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{December 2019}})m4_dnl +m4_define({{_monthyear_}}, {{January 2020}})m4_dnl diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index a2617e1a8..6736d5082 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: 354dc6a7a17c244ef4c9b74ce8a07190e798a13b158c0169dfb17633c1f58f60 +-- hash: 44e87e99fa5ad71ff9b86d3654ceb43e1d2d53151a36cf18e2b897ad54de144e name: hledger-ui -version: 1.16.1 +version: 1.16.99 synopsis: Terminal user interface for the hledger accounting tool description: This is hledger's terminal 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.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: ansi-terminal >=0.6.2.3 , async @@ -77,8 +77,8 @@ executable hledger-ui , extra >=1.6.3 , filepath , fsnotify >=0.2.1.2 && <0.4 - , hledger >=1.16.1 && <1.17 - , hledger-lib >=1.16.1 && <1.17 + , hledger >=1.16.99 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , 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 6f280f719..5263f3b5f 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : 1.16.1 +version : 1.16.99 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.16.1" +cpp-options: -DVERSION="1.16.99" dependencies: -- hledger-lib >=1.16.1 && <1.17 -- hledger >=1.16.1 && <1.17 +- hledger-lib >=1.16.99 && <1.17 +- hledger >=1.16.99 && <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 bbb75a1b6..b152d15c0 100644 --- a/hledger-web/.version +++ b/hledger-web/.version @@ -1 +1 @@ -1.16.1 \ No newline at end of file +1.16.99 \ No newline at end of file diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index 443f5f124..f04f2f0be 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.16.1}})m4_dnl +m4_define({{_version_}}, {{1.16.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{December 2019}})m4_dnl +m4_define({{_monthyear_}}, {{January 2020}})m4_dnl diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 42800a4b4..def16214f 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: 009db76878af9603a492a0f3a9fdd46e3a4fd5795cccef390e80325ec94c8808 +-- hash: 194a16a30440803cd2bef5d5df0b6115ad66076c44407ed31efea9c4602e5e95 name: hledger-web -version: 1.16.1 +version: 1.16.99 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 -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints - cpp-options: -DVERSION="1.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: Decimal , aeson @@ -169,8 +169,8 @@ library , extra >=1.6.3 , filepath , hjsmin - , hledger >=1.16.1 && <1.17 - , hledger-lib >=1.16.1 && <1.17 + , hledger >=1.16.99 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , http-client , http-conduit , http-types @@ -206,7 +206,7 @@ executable hledger-web hs-source-dirs: app ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints - cpp-options: -DVERSION="1.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index c9667754f..9870d2b85 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: 1.16.1 +version: 1.16.99 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.16.1" + cpp-options: -DVERSION="1.16.99" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -96,8 +96,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.16.1 && <1.17 - - hledger >=1.16.1 && <1.17 + - hledger-lib >=1.16.99 && <1.17 + - hledger >=1.16.99 && <1.17 - aeson - base >=4.9 && <4.14 - blaze-html @@ -142,7 +142,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.16.1" + cpp-options: -DVERSION="1.16.99" dependencies: - base - hledger-web @@ -158,7 +158,7 @@ executables: # source-dirs: test # main: test.hs # other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 -# cpp-options: -DVERSION="1.16.1" +# cpp-options: -DVERSION="1.16.99" # dependencies: # - base # - hledger-web diff --git a/hledger/.version b/hledger/.version index bbb75a1b6..b152d15c0 100644 --- a/hledger/.version +++ b/hledger/.version @@ -1 +1 @@ -1.16.1 \ No newline at end of file +1.16.99 \ No newline at end of file diff --git a/hledger/defs.m4 b/hledger/defs.m4 index 443f5f124..f04f2f0be 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.16.1}})m4_dnl +m4_define({{_version_}}, {{1.16.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{December 2019}})m4_dnl +m4_define({{_monthyear_}}, {{January 2020}})m4_dnl diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 0f1e7c0a4..18ca8e330 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 84e2963cf5ef19727a8719de14430ed621a304efb5a80cf0509872fe46f69992 +-- hash: dccfd747a09ddc253d2352befe0f49e195ea409c4df838416389f0baaafab8de name: hledger -version: 1.16.1 +version: 1.16.99 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 @@ -144,7 +144,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.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: Decimal , Diff @@ -161,7 +161,7 @@ library , filepath , hashable >=1.2.4 , haskeline >=0.6 - , hledger-lib >=1.16.1 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , lucid , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 @@ -197,7 +197,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.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: Decimal , aeson @@ -213,7 +213,7 @@ executable hledger , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.16.1 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl >=2.2.1 @@ -249,7 +249,7 @@ test-suite unittest 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.16.1" + cpp-options: -DVERSION="1.16.99" build-depends: Decimal , aeson @@ -265,7 +265,7 @@ test-suite unittest , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.16.1 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl >=2.2.1 @@ -315,7 +315,7 @@ benchmark bench , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.16.1 && <1.17 + , hledger-lib >=1.16.99 && <1.17 , html , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 diff --git a/hledger/package.yaml b/hledger/package.yaml index 5f6328a62..21f859376 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: 1.16.1 +version: 1.16.99 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.16.1 && <1.17 +- hledger-lib >=1.16.99 && <1.17 - aeson - ansi-terminal >=0.6.2.3 - base >=4.9 && <4.14 @@ -148,7 +148,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.16.1" + cpp-options: -DVERSION="1.16.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -196,7 +196,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.16.1" + cpp-options: -DVERSION="1.16.99" 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.16.1" + cpp-options: -DVERSION="1.16.99" dependencies: - hledger