From 5706353881543e75a19219aa9ac68d6461b94479 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 31 Jul 2017 14:02:35 -0700 Subject: [PATCH] bump version strings & lower bounds to 1.3.99 --- .version | 2 +- doc/lib.m4 | 2 +- hledger-api/hledger-api.hs | 4 ++-- hledger-api/package.yaml | 8 ++++---- hledger-lib/package.yaml | 2 +- hledger-ui/package.yaml | 8 ++++---- hledger-web/package.yaml | 12 ++++++------ hledger/package.yaml | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.version b/.version index 7e32cd569..3e7fd5b16 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3 +1.3.99 diff --git a/doc/lib.m4 b/doc/lib.m4 index 7f22a15e0..5ccf963ef 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -8,7 +8,7 @@ m4_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl m4_dnl m4_define({{_author_}}, {{}})m4_dnl m4_define({{_monthyear_}}, {{June 2017}})m4_dnl -m4_define({{_version_}}, {{1.3}})m4_dnl +m4_define({{_version_}}, {{1.3.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.hs b/hledger-api/hledger-api.hs index a1af41c05..d41e8d66f 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -35,12 +35,12 @@ import Text.Printf import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.3" +hledgerApiVersion="1.3.99" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.3 +hledger-api 1.3.99 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index d173b920e..d5c0c84a7 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.3' +version: '1.3.99' synopsis: Web API server for the hledger accounting tool description: | This is a simple web API server for hledger data. @@ -27,8 +27,8 @@ data-files: - doc/hledger-api.1.txt - doc/hledger-api.1.info dependencies: -- hledger-lib >= 1.3 && < 1.4 -- hledger >= 1.3 && < 1.4 +- hledger-lib >= 1.3.99 && < 1.4 +- hledger >= 1.3.99 && < 1.4 - base >=4.8 && <5 - aeson - bytestring @@ -51,6 +51,6 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" stability: alpha tested-with: GHC==7.10.3, GHC==8.0 diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 0109746cd..6b2b68078 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.3' +version: '1.3.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/package.yaml b/hledger-ui/package.yaml index d62d7a290..74ecc0d27 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.3' +version : '1.3.99' synopsis : Curses-style user interface for the hledger accounting tool description : | This is hledger's curses-style interface. @@ -35,7 +35,7 @@ flags: description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. manual: false default: false -cpp-options: -DVERSION="1.3" +cpp-options: -DVERSION="1.3.99" executables: hledger-ui: source-dirs: . @@ -48,8 +48,8 @@ executables: -fno-warn-type-defaults -fno-warn-orphans dependencies: - - hledger >= 1.3 && < 1.4 - - hledger-lib >= 1.3 && < 1.4 + - hledger >= 1.3.99 && < 1.4 + - hledger-lib >= 1.3.99 && < 1.4 - ansi-terminal >= 0.6.2.3 && < 0.7 - async - base >= 4.8 && < 5 diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index df22bcc56..708d122f8 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.3' +version: '1.3.99' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -60,8 +60,8 @@ flags: manual: false default: false dependencies: -- hledger-lib >= 1.3 && < 1.4 -- hledger >= 1.3 && < 1.4 +- hledger-lib >= 1.3.99 && < 1.4 +- hledger >= 1.3.99 && < 1.4 - base >=4.8 && <5 - base-compat >=0.8.1 - blaze-html @@ -100,7 +100,7 @@ ghc-options: - -fno-warn-type-defaults - -fno-warn-orphans library: - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" exposed-modules: - Application - Foundation @@ -139,7 +139,7 @@ executables: hledger-web: main: main.hs source-dirs: app - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" dependencies: - parsec >=3 - hledger-web == 1.3 @@ -167,7 +167,7 @@ tests: test: main: main.hs source-dirs: tests - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" dependencies: - hledger-web == 1.3 - hspec diff --git a/hledger/package.yaml b/hledger/package.yaml index 2f7185840..6a3ce3b76 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.3' +version: '1.3.99' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -82,7 +82,7 @@ ghc-options: - -fno-warn-type-defaults - -fno-warn-orphans library: - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -107,7 +107,7 @@ library: - Hledger.Cli.Stats - Text.Tabular.AsciiWide dependencies: - - hledger-lib >= 1.3 && < 1.4 + - hledger-lib >= 1.3.99 && < 1.4 - bytestring - containers - unordered-containers @@ -155,7 +155,7 @@ executables: hledger: main: hledger-cli.hs source-dirs: app - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" dependencies: - hledger-lib >= 1.3 - hledger == 1.3 @@ -206,7 +206,7 @@ tests: test: main: test.hs source-dirs: test - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.99" dependencies: - hledger-lib >= 1.3 - hledger == 1.3