From c9e16b83ef6b53f4329de59a6736ad60c93c2d02 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 20 Mar 2019 17:13:59 -0700 Subject: [PATCH] ; propagate dev version bump --- hledger-api/defs.m4 | 2 +- hledger-api/hledger-api.cabal | 10 +++++----- hledger-api/package.yaml | 8 ++++---- hledger-lib/defs.m4 | 2 +- hledger-lib/hledger-lib.cabal | 4 ++-- hledger-lib/package.yaml | 2 +- hledger-ui/defs.m4 | 2 +- hledger-ui/hledger-ui.cabal | 12 ++++++------ hledger-ui/package.yaml | 8 ++++---- hledger-web/defs.m4 | 2 +- hledger-web/hledger-web.cabal | 12 ++++++------ hledger-web/package.yaml | 12 ++++++------ hledger/defs.m4 | 2 +- hledger/hledger.cabal | 18 +++++++++--------- hledger/package.yaml | 10 +++++----- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/hledger-api/defs.m4 b/hledger-api/defs.m4 index cf82d8d7c..a55b70425 100644 --- a/hledger-api/defs.m4 +++ b/hledger-api/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.14}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index e1c86e3c3..186d43803 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: 2252448c445cee50d317dbf5a0994b97988f6fa1c0c4cf68bd08e0f5068198b0 +-- hash: e6986f7044af807744a4fb0310664c9cf53d360a5848151fd6a5f473f4cd41fd name: hledger-api -version: 1.14 +version: 1.14.99 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.14" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , aeson @@ -56,8 +56,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.14.1 && <1.15 - , hledger-lib >=1.14 && <1.15 + , hledger >=1.14.99 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , microlens >=0.4 , microlens-platform >=0.2.3.1 , safe diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index af4e3e81f..e6556247d 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: 1.14 +version: 1.14.99 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.14 && <1.15 -- hledger >=1.14.1 && <1.15 +- hledger-lib >=1.14.99 && <1.15 +- hledger >=1.14.99 && <1.15 - 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.14" + cpp-options: -DVERSION="1.14.99" diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index cf82d8d7c..a55b70425 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.14}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 365bd8fbe..5491498a7 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: c3d364a1b6c518c28f158056c77b07a1d5f77ce81b78bbc5eef793acda6e95bb +-- hash: f1dea3e636e26f58a16c43e3cb9cb21b86dda529b11f5c3580e04ec7bfd20121 name: hledger-lib -version: 1.14 +version: 1.14.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 a9e12b3f9..176d51935 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: 1.14 +version: 1.14.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/defs.m4 b/hledger-ui/defs.m4 index cf82d8d7c..a55b70425 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.14}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index bdcc3d670..1d70b42f1 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: f92a5085f7e5f2107744de0025bda50e0037d281248748b9bfc797ce6b2f2d69 +-- hash: ef67b87601d6a5f1a84e99b5cc63894fa0a603673c612fe50037211d7f4578ad name: hledger-ui -version: 1.14 +version: 1.14.99 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.14" + cpp-options: -DVERSION="1.14.99" 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.14.1 && <1.15 - , hledger-lib >=1.14 && <1.15 + , hledger >=1.14.99 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , megaparsec >=7.0.0 && <8 , microlens >=0.4 , microlens-platform >=0.2.3.1 @@ -94,7 +94,7 @@ executable hledger-ui buildable: False else build-depends: - brick >=0.23 + brick >=0.23 && <0.47 , unix , vty >=5.5 if flag(threaded) diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index e00a24572..4e9d337b7 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : 1.14 +version : 1.14.99 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.14" +cpp-options: -DVERSION="1.14.99" dependencies: -- hledger-lib >=1.14 && <1.15 -- hledger >=1.14.1 && <1.15 +- hledger-lib >=1.14.99 && <1.15 +- hledger >=1.14.99 && <1.15 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.13 diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index cf82d8d7c..a55b70425 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.14}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 3c8a6fde8..aedb7be38 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: a69b726536242bd32402b7c1e1639a19509e1eb263f04ec8dd61bbed7ceb2e72 +-- hash: f310f13bacba170ff9c2648c3a4ba739fa8ed4afeabd4c007a0a6b6ac9f13a87 name: hledger-web -version: 1.14 +version: 1.14.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 @@ -151,7 +151,7 @@ library hs-source-dirs: ./. ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.14" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , aeson @@ -169,8 +169,8 @@ library , directory , filepath , hjsmin - , hledger >=1.14.1 && <1.15 - , hledger-lib >=1.14 && <1.15 + , hledger >=1.14.99 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , http-client , http-conduit , http-types @@ -211,7 +211,7 @@ executable hledger-web hs-source-dirs: app ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.14" + cpp-options: -DVERSION="1.14.99" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 8b2748233..c584e6d19 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: 1.14 +version: 1.14.99 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.14" + cpp-options: -DVERSION="1.14.99" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -99,8 +99,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.14 && <1.15 - - hledger >=1.14.1 && <1.15 + - hledger-lib >=1.14.99 && <1.15 + - hledger >=1.14.99 && <1.15 - aeson - base >=4.8 && <4.13 - blaze-html @@ -150,7 +150,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.14" + cpp-options: -DVERSION="1.14.99" dependencies: - base - hledger-web @@ -167,7 +167,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.14" +# cpp-options: -DVERSION="1.14.99" # dependencies: # - base # - hledger-web diff --git a/hledger/defs.m4 b/hledger/defs.m4 index eb07f15ab..a55b70425 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.14.1}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index d28c1534d..83999261c 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 2268c7796f5cb9b049cc817c572e0d69a4d784a1b4bfa9df98dca771963e6b2c +-- hash: c25c2177f7c03b76b14aa9fa36b0cb9aba95bb836c183de3361616e41aed526a name: hledger -version: 1.14.1 +version: 1.14.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 @@ -140,7 +140,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.14.1" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , Diff @@ -156,7 +156,7 @@ library , filepath , hashable >=1.2.4 , haskeline >=0.6 - , hledger-lib >=1.14 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , lucid , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 @@ -191,7 +191,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.14.1" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -206,7 +206,7 @@ executable hledger , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -243,7 +243,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.14.1" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -258,7 +258,7 @@ test-suite test , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -310,7 +310,7 @@ benchmark bench , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14 && <1.15 + , hledger-lib >=1.14.99 && <1.15 , html , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 diff --git a/hledger/package.yaml b/hledger/package.yaml index f28d429eb..a7b2a68e9 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: 1.14.1 +version: 1.14.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.14 && <1.15 +- hledger-lib >=1.14.99 && <1.15 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 @@ -146,7 +146,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.14.1" + cpp-options: -DVERSION="1.14.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -190,7 +190,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.14.1" + cpp-options: -DVERSION="1.14.99" when: - condition: flag(threaded) ghc-options: -threaded @@ -201,7 +201,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.14.1" + cpp-options: -DVERSION="1.14.99" dependencies: - hledger - test-framework