From f65fc47185f6d6faf6fca6f733e966ff254823e8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 13 Sep 2019 08:36:54 -0700 Subject: [PATCH] ;bump version to 1.15.99 [ci skip] --- .version | 2 +- doc/common.m4 | 2 +- hledger-lib/.version | 2 +- hledger-lib/defs.m4 | 2 +- hledger-lib/hledger-lib.cabal | 4 ++-- hledger-lib/package.yaml | 2 +- hledger-ui/.version | 2 +- hledger-ui/defs.m4 | 2 +- hledger-ui/hledger-ui.cabal | 10 +++++----- hledger-ui/package.yaml | 8 ++++---- hledger-web/.version | 2 +- hledger-web/defs.m4 | 2 +- hledger-web/hledger-web.cabal | 12 ++++++------ hledger-web/package.yaml | 12 ++++++------ hledger/.version | 2 +- hledger/defs.m4 | 2 +- hledger/hledger.cabal | 18 +++++++++--------- hledger/package.yaml | 10 +++++----- 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.version b/.version index d3456a90f..061a564dc 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.13 +1.15.99 diff --git a/doc/common.m4 b/doc/common.m4 index 3be2c0ff5..7b1e6efd1 100644 --- a/doc/common.m4 +++ b/doc/common.m4 @@ -24,7 +24,7 @@ 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_** +This doc is for version **_version_** (dev) m4_dnl comment (dev) for releases, uncomment between releases: m4_dnl (dev) . diff --git a/hledger-lib/.version b/hledger-lib/.version index 4761f0e9d..ca6ebbc36 100644 --- a/hledger-lib/.version +++ b/hledger-lib/.version @@ -1 +1 @@ -1.15.2 \ No newline at end of file +1.15.99 \ No newline at end of file diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index 4c667cefd..cfc8c4dbe 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.2}})m4_dnl +m4_define({{_version_}}, {{1.15.99}})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/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index d47c9ffea..9a158d72a 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: 030f9139cc46202b3d02732e01d84b4d4e41b54e564e92c5ec2678b8e4a09931 +-- hash: 5800a813057af070936e23a2a043e79ba8d5eadb30d8d9d8953b87b0599c4d23 name: hledger-lib -version: 1.15.2 +version: 1.15.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 e58010ec5..b037f4dc8 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: 1.15.2 +version: 1.15.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 07fe6f6c9..ca6ebbc36 100644 --- a/hledger-ui/.version +++ b/hledger-ui/.version @@ -1 +1 @@ -1.15 \ No newline at end of file +1.15.99 \ No newline at end of file diff --git a/hledger-ui/defs.m4 b/hledger-ui/defs.m4 index 28594ae78..59e5203ff 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}})m4_dnl +m4_define({{_version_}}, {{1.15.99}})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/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 810a3a8ed..8ff168d4d 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: ca03d666e614851f8555b154bc16d987c21f3f6805920c7d4e6f0abada02f63e +-- hash: e67b3a88332a7f2f449bef9062a1b88b69fa7a1cfaf9be253f502a54b31bfc69 name: hledger-ui -version: 1.15 +version: 1.15.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.15" + cpp-options: -DVERSION="1.15.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.15 && <1.16 - , hledger-lib >=1.15 && <1.16 + , hledger >=1.15.99 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , 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 e7c6e3e6a..53985f599 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : 1.15 +version : 1.15.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.15" +cpp-options: -DVERSION="1.15.99" dependencies: -- hledger-lib >=1.15 && <1.16 -- hledger >=1.15 && <1.16 +- hledger-lib >=1.15.99 && <1.16 +- hledger >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.13 diff --git a/hledger-web/.version b/hledger-web/.version index 07fe6f6c9..ca6ebbc36 100644 --- a/hledger-web/.version +++ b/hledger-web/.version @@ -1 +1 @@ -1.15 \ No newline at end of file +1.15.99 \ No newline at end of file diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index 28594ae78..59e5203ff 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}})m4_dnl +m4_define({{_version_}}, {{1.15.99}})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/hledger-web.cabal b/hledger-web/hledger-web.cabal index 47b9cc69b..556656329 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: 1b0acc5e6bd4e330e088554e594bdead5ca89869d2472fd5ca2adeaa36a6dab8 +-- hash: 51a049cca192a9e8f8aad9e033c6e8dec4dfebdb19e523e26cd81c1a7f418758 name: hledger-web -version: 1.15 +version: 1.15.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.15" + cpp-options: -DVERSION="1.15.99" build-depends: Decimal , aeson @@ -169,8 +169,8 @@ library , directory , filepath , hjsmin - , hledger >=1.15 && <1.16 - , hledger-lib >=1.15 && <1.16 + , hledger >=1.15.99 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , 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.15" + cpp-options: -DVERSION="1.15.99" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 032073076..9e83a1a97 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: 1.15 +version: 1.15.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.15" + cpp-options: -DVERSION="1.15.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.15 && <1.16 - - hledger >=1.15 && <1.16 + - hledger-lib >=1.15.99 && <1.16 + - hledger >=1.15.99 && <1.16 - 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.15" + cpp-options: -DVERSION="1.15.99" dependencies: - base - hledger-web @@ -167,7 +167,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.15" +# cpp-options: -DVERSION="1.15.99" # dependencies: # - base # - hledger-web diff --git a/hledger/.version b/hledger/.version index 4761f0e9d..ca6ebbc36 100644 --- a/hledger/.version +++ b/hledger/.version @@ -1 +1 @@ -1.15.2 \ No newline at end of file +1.15.99 \ No newline at end of file diff --git a/hledger/defs.m4 b/hledger/defs.m4 index 4c667cefd..cfc8c4dbe 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.2}})m4_dnl +m4_define({{_version_}}, {{1.15.99}})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/hledger.cabal b/hledger/hledger.cabal index 35884ba78..6e0b44563 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 28124784347b85a45c54846f2cc24147e3b8b0ea1fefed8d1cac762bcf166682 +-- hash: b864d03deb10457bee840db359d886fab19a33d56e673afa900265f845d17618 name: hledger -version: 1.15.2 +version: 1.15.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 @@ -143,7 +143,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.15.2" + cpp-options: -DVERSION="1.15.99" build-depends: Decimal , Diff @@ -160,7 +160,7 @@ library , filepath , hashable >=1.2.4 , haskeline >=0.6 - , hledger-lib >=1.15.2 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , lucid , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 @@ -196,7 +196,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.15.2" + cpp-options: -DVERSION="1.15.99" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -212,7 +212,7 @@ executable hledger , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.15.2 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -250,7 +250,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.15.2" + cpp-options: -DVERSION="1.15.99" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -266,7 +266,7 @@ test-suite test , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.15.2 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -320,7 +320,7 @@ benchmark bench , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.15.2 && <1.16 + , hledger-lib >=1.15.99 && <1.16 , html , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 diff --git a/hledger/package.yaml b/hledger/package.yaml index 6b0f30cd8..8bc483085 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: 1.15.2 +version: 1.15.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.15.2 && <1.16 +- hledger-lib >=1.15.99 && <1.16 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.12 @@ -148,7 +148,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.15.2" + cpp-options: -DVERSION="1.15.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -195,7 +195,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.15.2" + cpp-options: -DVERSION="1.15.99" when: - condition: flag(threaded) ghc-options: -threaded @@ -206,7 +206,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.15.2" + cpp-options: -DVERSION="1.15.99" dependencies: - hledger - test-framework