From 29f7654c3a398fef082a227202b88a9898e41f86 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 31 Aug 2019 21:01:25 -0700 Subject: [PATCH] bump versions to 1.15 --- Shake.hs | 2 +- hledger-api/.version | 2 +- hledger-api/defs.m4 | 4 ++-- hledger-api/hledger-api.cabal | 10 +++++----- hledger-api/package.yaml | 10 +++++----- hledger-lib/.version | 2 +- hledger-lib/defs.m4 | 4 ++-- hledger-lib/hledger-lib.cabal | 4 ++-- hledger-lib/package.yaml | 2 +- hledger-ui/.version | 2 +- hledger-ui/defs.m4 | 4 ++-- hledger-ui/hledger-ui.cabal | 10 +++++----- hledger-ui/package.yaml | 8 ++++---- hledger-web/.version | 2 +- hledger-web/defs.m4 | 4 ++-- hledger-web/hledger-web.cabal | 12 ++++++------ hledger-web/package.yaml | 12 ++++++------ hledger/.version | 2 +- hledger/defs.m4 | 4 ++-- hledger/hledger.cabal | 18 +++++++++--------- hledger/package.yaml | 10 +++++----- 21 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Shake.hs b/Shake.hs index d57f93ca0..ce24ecf7d 100755 --- a/Shake.hs +++ b/Shake.hs @@ -157,7 +157,7 @@ main = do let -- documentation versions shown on the website - docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12", "1.13", "1.14" ] + docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12", "1.13", "1.14", "1.15" ] -- main package names, in standard build order packages = [ diff --git a/hledger-api/.version b/hledger-api/.version index a6874e690..07fe6f6c9 100644 --- a/hledger-api/.version +++ b/hledger-api/.version @@ -1 +1 @@ -1.14.99 \ No newline at end of file +1.15 \ No newline at end of file diff --git a/hledger-api/defs.m4 b/hledger-api/defs.m4 index a55b70425..28594ae78 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.99}})m4_dnl +m4_define({{_version_}}, {{1.15}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{March 2019}})m4_dnl +m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 413d37705..f5e3d4cb0 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: cfdba68c1a3ad11055ca8171723638880d9cebed815a2d70677fd29a900055d8 +-- hash: abc0cf2dc37fed2028d3e6ead7e20d838b74f598bf8fa421130fd47f91d845f6 name: hledger-api -version: 1.14.99 +version: 1.15 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.99" + cpp-options: -DVERSION="1.15" build-depends: Decimal , aeson @@ -56,8 +56,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.14.99 && <1.15 - , hledger-lib >=1.14.99 && <1.15 + , hledger >=1.15 && <1.16 + , hledger-lib >=1.15 && <1.16 , microlens >=0.4 , microlens-platform >=0.2.3.1 , safe diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 877af6bc0..1c8899265 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: 1.14.99 +version: 1.15 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.99 && <1.15 -- hledger >=1.14.99 && <1.15 +- hledger-lib >=1.15 && <1.16 +- hledger >=1.15 && <1.16 - base >=4.8 && <4.13 - aeson - bytestring @@ -47,7 +47,7 @@ dependencies: - safe - servant-server >=0.10 - servant-swagger -- swagger2 >=2.0 && <2.4 +- swagger2 >=2.0 && <2.5 - text - transformers - wai @@ -58,4 +58,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.14.99" + cpp-options: -DVERSION="1.15" diff --git a/hledger-lib/.version b/hledger-lib/.version index a6874e690..07fe6f6c9 100644 --- a/hledger-lib/.version +++ b/hledger-lib/.version @@ -1 +1 @@ -1.14.99 \ No newline at end of file +1.15 \ No newline at end of file diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index a55b70425..28594ae78 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.99}})m4_dnl +m4_define({{_version_}}, {{1.15}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{March 2019}})m4_dnl +m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 179b3452d..4a99decba 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: f53d007c317d0d34ee5afecee41cbdfc43b6ae3b4ae9f119a5f7ad11bf231b29 +-- hash: 29b6dee7771d38c64240d2b8c53c8e41ed43c08e8fe2e93cbd6c531edc2a4ecd name: hledger-lib -version: 1.14.99 +version: 1.15 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 292111a05..e5cc6ac72 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: 1.14.99 +version: 1.15 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 a6874e690..07fe6f6c9 100644 --- a/hledger-ui/.version +++ b/hledger-ui/.version @@ -1 +1 @@ -1.14.99 \ No newline at end of file +1.15 \ No newline at end of file diff --git a/hledger-ui/defs.m4 b/hledger-ui/defs.m4 index a55b70425..28594ae78 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.99}})m4_dnl +m4_define({{_version_}}, {{1.15}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{March 2019}})m4_dnl +m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 49d25a81c..8a50525c4 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: c8ceb1eacc64770fa5b38405f2c7ffa7ef2f1bd478ef639dc7f2f30becb43995 +-- hash: 0deef0df7a1a0ef153ebf7e31ddd57882a2671941a0f801bc2980dae7080501f name: hledger-ui -version: 1.14.99 +version: 1.15 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.99" + cpp-options: -DVERSION="1.15" 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.99 && <1.15 - , hledger-lib >=1.14.99 && <1.15 + , hledger >=1.15 && <1.16 + , hledger-lib >=1.15 && <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 a2eddd8fe..72466a350 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : 1.14.99 +version : 1.15 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.99" +cpp-options: -DVERSION="1.15" dependencies: -- hledger-lib >=1.14.99 && <1.15 -- hledger >=1.14.99 && <1.15 +- hledger-lib >=1.15 && <1.16 +- hledger >=1.15 && <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 a6874e690..07fe6f6c9 100644 --- a/hledger-web/.version +++ b/hledger-web/.version @@ -1 +1 @@ -1.14.99 \ No newline at end of file +1.15 \ No newline at end of file diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index a55b70425..28594ae78 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.99}})m4_dnl +m4_define({{_version_}}, {{1.15}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{March 2019}})m4_dnl +m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index f2a3f8842..0510b750f 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: 47eb47613f96ddaa3c112f5a71f59c7a4b0fab92a5aa040e7f46989b1441481f +-- hash: 0edf95448e05cc75fb3c049d3ecc20264e8869497966ac5eb8783ee803dbce35 name: hledger-web -version: 1.14.99 +version: 1.15 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.99" + cpp-options: -DVERSION="1.15" build-depends: Decimal , aeson @@ -169,8 +169,8 @@ library , directory , filepath , hjsmin - , hledger >=1.14.99 && <1.15 - , hledger-lib >=1.14.99 && <1.15 + , hledger >=1.15 && <1.16 + , hledger-lib >=1.15 && <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.14.99" + cpp-options: -DVERSION="1.15" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 272949512..8cfc6f733 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: 1.14.99 +version: 1.15 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.99" + cpp-options: -DVERSION="1.15" 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.99 && <1.15 - - hledger >=1.14.99 && <1.15 + - hledger-lib >=1.15 && <1.16 + - hledger >=1.15 && <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.14.99" + cpp-options: -DVERSION="1.15" dependencies: - base - hledger-web @@ -167,7 +167,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.14.99" +# cpp-options: -DVERSION="1.15" # dependencies: # - base # - hledger-web diff --git a/hledger/.version b/hledger/.version index a6874e690..07fe6f6c9 100644 --- a/hledger/.version +++ b/hledger/.version @@ -1 +1 @@ -1.14.99 \ No newline at end of file +1.15 \ No newline at end of file diff --git a/hledger/defs.m4 b/hledger/defs.m4 index a55b70425..28594ae78 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.99}})m4_dnl +m4_define({{_version_}}, {{1.15}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{March 2019}})m4_dnl +m4_define({{_monthyear_}}, {{August 2019}})m4_dnl diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index cb76af94d..25c73b55d 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: aba397aed9bafa008aa8c8ceb1716e09ab3f5faf7193872d705dd3fdbd7f950d +-- hash: 9b996544825f06ba1fe409f012a89d17e383ca7d94353ac080c40937ba5ce3d5 name: hledger -version: 1.14.99 +version: 1.15 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 @@ -146,7 +146,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.99" + cpp-options: -DVERSION="1.15" build-depends: Decimal , Diff @@ -163,7 +163,7 @@ library , filepath , hashable >=1.2.4 , haskeline >=0.6 - , hledger-lib >=1.14.99 && <1.15 + , hledger-lib >=1.15 && <1.16 , lucid , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 @@ -199,7 +199,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.99" + cpp-options: -DVERSION="1.15" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -215,7 +215,7 @@ executable hledger , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14.99 && <1.15 + , hledger-lib >=1.15 && <1.16 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -253,7 +253,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.99" + cpp-options: -DVERSION="1.15" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -269,7 +269,7 @@ test-suite test , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14.99 && <1.15 + , hledger-lib >=1.15 && <1.16 , math-functions >=0.2.0.0 , megaparsec >=7.0.0 && <8 , mtl @@ -323,7 +323,7 @@ benchmark bench , filepath , haskeline >=0.6 , hledger - , hledger-lib >=1.14.99 && <1.15 + , hledger-lib >=1.15 && <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 8af7e118d..7c741edf0 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: 1.14.99 +version: 1.15 synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -108,7 +108,7 @@ ghc-options: - -optP-Wno-nonportable-include-path dependencies: -- hledger-lib >=1.14.99 && <1.15 +- hledger-lib >=1.15 && <1.16 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 @@ -151,7 +151,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.14.99" + cpp-options: -DVERSION="1.15" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -198,7 +198,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.14.99" + cpp-options: -DVERSION="1.15" when: - condition: flag(threaded) ghc-options: -threaded @@ -209,7 +209,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.14.99" + cpp-options: -DVERSION="1.15" dependencies: - hledger - test-framework