From bc3f5c476c0aa09b1dac1e25ee927ed21e18b7b8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 4 Jan 2018 10:15:03 -0800 Subject: [PATCH] bump version to 1.5.99 --- .version | 2 +- doc/lib.m4 | 4 ++-- hledger-api/hledger-api.cabal | 10 +++++----- hledger-api/hledger-api.hs | 4 ++-- hledger-api/package.yaml | 8 ++++---- hledger-lib/hledger-lib.cabal | 4 ++-- hledger-lib/package.yaml | 2 +- hledger-ui/hledger-ui.cabal | 10 +++++----- hledger-ui/package.yaml | 8 ++++---- hledger-web/hledger-web.cabal | 22 +++++++++++----------- hledger-web/package.yaml | 12 ++++++------ hledger/hledger.cabal | 18 +++++++++--------- hledger/package.yaml | 10 +++++----- 13 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.version b/.version index c239c60cb..c96cc17e8 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.5 +1.5.99 diff --git a/doc/lib.m4 b/doc/lib.m4 index 4f69d2d20..aac7db3ed 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_}}, {{December 2017}})m4_dnl -m4_define({{_version_}}, {{1.5}})m4_dnl +m4_define({{_monthyear_}}, {{January 2018}})m4_dnl +m4_define({{_version_}}, {{1.5.99}})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. diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 2189a1a7d..1ad95c996 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: fb76194ccf25e07379b144d9ac8eb4ae4936140b939cd8610c7c6fc6ee07f9c9 +-- hash: 2ba06bc3009a704bd5e904823472d017379f40db355ae36b066113536467e03c name: hledger-api -version: 1.5 +version: 1.5.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 @@ source-repository head executable hledger-api main-is: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" build-depends: Decimal , aeson @@ -55,8 +55,8 @@ executable hledger-api , containers , docopt , either - , hledger >=1.5 && <1.6 - , hledger-lib >=1.5 && <1.6 + , hledger >=1.5.99 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , microlens >=0.4 , microlens-platform >=0.2.3.1 , safe diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs index 26fdf4a8a..5d57a051a 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" +hledgerApiVersion="1.5.99" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.5 +hledger-api 1.5.99 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index c1d4839d6..2cc56b39b 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.5' +version: '1.5.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 @@ data-files: - hledger-api.info dependencies: -- hledger-lib >=1.5 && <1.6 -- hledger >=1.5 && <1.6 +- hledger-lib >=1.5.99 && <1.6 +- hledger >=1.5.99 && <1.6 - base >=4.8 && <5 - aeson - bytestring @@ -57,4 +57,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index f7152f3a0..ed7932744 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: c0497f13da483640b446c596007d9e15f8235a01f8b2ae8ffa96f89dbf59ffb7 +-- hash: 0359b7d353e59a15012d14a39fea7d133562b202c70969984a8fd918f27417e8 name: hledger-lib -version: 1.5 +version: 1.5.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 3c271ec37..5ee69f34c 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.5' +version: '1.5.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/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index ec3e33831..77e8f9d2d 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 0415bc39f4fbc4cec62ff37e03c0ff513b23cd4825310c799a42177cd9245f1e +-- hash: dd0253057446851aae37d74a6f743e6365772780e2070e0e38f31d56a6610fdc name: hledger-ui -version: 1.5 +version: 1.5.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, @@ -52,7 +52,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.5" + cpp-options: -DVERSION="1.5.99" build-depends: HUnit , ansi-terminal >=0.6.2.3 @@ -65,8 +65,8 @@ executable hledger-ui , directory , filepath , fsnotify >=0.2 - , hledger >=1.5 && <1.6 - , hledger-lib >=1.5 && <1.6 + , hledger >=1.5.99 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , megaparsec >=5.0 , microlens >=0.4 , microlens-platform >=0.2.3.1 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index f6226766e..918b901a7 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.5' +version : '1.5.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.5" +cpp-options: -DVERSION="1.5.99" dependencies: - - hledger >=1.5 && <1.6 - - hledger-lib >=1.5 && <1.6 + - hledger >=1.5.99 && <1.6 + - hledger-lib >=1.5.99 && <1.6 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <5 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 8748d673d..526b23626 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 4b29b9e5703c56c1f7beabdcec14cf3007d6f6c6855088b8bf06da8f092b4b3d +-- hash: ab1ce07009282db56c0dd739039af340a8b2f2c8f710157c2c78cdbc1709dfdd name: hledger-web -version: 1.5 +version: 1.5.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 @@ -124,7 +124,7 @@ flag threaded library 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.5" + cpp-options: -DVERSION="1.5.99" build-depends: HUnit , base >=4.8 && <5 @@ -139,8 +139,8 @@ library , directory , filepath , hjsmin - , hledger >=1.5 && <1.6 - , hledger-lib >=1.5 && <1.6 + , hledger >=1.5.99 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , http-client , http-conduit , json @@ -192,7 +192,7 @@ executable hledger-web 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 - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" build-depends: HUnit , base >=4.8 && <5 @@ -207,8 +207,8 @@ executable hledger-web , directory , filepath , hjsmin - , hledger >=1.5 && <1.6 - , hledger-lib >=1.5 && <1.6 + , hledger >=1.5.99 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , hledger-web , http-client , http-conduit @@ -249,7 +249,7 @@ test-suite test hs-source-dirs: tests 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.5" + cpp-options: -DVERSION="1.5.99" build-depends: HUnit , base >=4.8 && <5 @@ -264,8 +264,8 @@ test-suite test , directory , filepath , hjsmin - , hledger >=1.5 && <1.6 - , hledger-lib >=1.5 && <1.6 + , hledger >=1.5.99 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , hledger-web , hspec , http-client diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 7520b5897..5f7161b20 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.5' +version: '1.5.99' 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 && <1.6 -- hledger >=1.5 && <1.6 +- hledger-lib >=1.5.99 && <1.6 +- hledger >=1.5.99 && <1.6 - base >=4.8 && <5 - base-compat >=0.8.1 - blaze-html @@ -114,7 +114,7 @@ ghc-options: - -fno-warn-orphans library: - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" exposed-modules: - Application - Foundation @@ -137,7 +137,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" dependencies: - hledger-web when: @@ -150,7 +150,7 @@ tests: test: source-dirs: tests main: main.hs - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" dependencies: - hledger-web - hspec diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index d660a51e3..6dedb08a8 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 4b322928cce5df23c77a7f404c11167cd43fc20c0e236fa93a61ed474c003d64 +-- hash: b3929eebc33ec5bd2e240d49c003aba48ddc1d4f0e9a09ca2e8161d531bd9fb3 name: hledger -version: 1.5 +version: 1.5.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 @@ -77,7 +77,7 @@ flag threaded library 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.5" + cpp-options: -DVERSION="1.5.99" build-depends: Decimal , Diff @@ -96,7 +96,7 @@ library , hashable >=1.2.4 , haskeline >=0.6 , here - , hledger-lib >=1.5 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , megaparsec >=5.0 , mtl , mtl-compat @@ -159,7 +159,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 - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" build-depends: Decimal , HUnit @@ -177,7 +177,7 @@ executable hledger , haskeline >=0.6 , here , hledger - , hledger-lib >=1.5 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , mtl , mtl-compat , old-time @@ -211,7 +211,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 - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" build-depends: Decimal , HUnit @@ -229,7 +229,7 @@ test-suite test , haskeline >=0.6 , here , hledger - , hledger-lib >=1.5 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , mtl , mtl-compat , old-time @@ -273,7 +273,7 @@ benchmark bench , filepath , here , hledger - , hledger-lib >=1.5 && <1.6 + , hledger-lib >=1.5.99 && <1.6 , html , pretty-show >=1.6.4 , process diff --git a/hledger/package.yaml b/hledger/package.yaml index 9d0da50f6..d611c5cc8 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.5' +version: '1.5.99' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -87,7 +87,7 @@ dependencies: - tabular >=0.2 - time >=1.5 - utility-ht >=0.0.13 -- hledger-lib >=1.5 && <1.6 +- hledger-lib >=1.5.99 && <1.6 when: - condition: (!(os(windows))) && (flag(terminfo)) @@ -95,7 +95,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -155,7 +155,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" when: - condition: flag(threaded) ghc-options: -threaded @@ -185,7 +185,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.5" + cpp-options: -DVERSION="1.5.99" dependencies: - hledger - bytestring