From b798c4804077df5a31059667bba0b76a6fb85d5a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 30 Sep 2018 20:07:45 -1000 Subject: [PATCH] bump version to 1.11 --- .version | 2 +- doc/lib.m4 | 2 +- hledger-api/hledger-api.cabal | 10 +++++----- hledger-api/hledger-api.hs | 4 ++-- hledger-api/package.yaml | 8 ++++---- hledger-install/hledger-install.sh | 10 +++++----- 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 | 12 ++++++------ hledger-web/package.yaml | 12 ++++++------ hledger/hledger.cabal | 18 +++++++++--------- hledger/package.yaml | 10 +++++----- 14 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.version b/.version index 3867e9359..096015870 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.10.99 +1.11 diff --git a/doc/lib.m4 b/doc/lib.m4 index 157e613d0..bb467961d 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -7,7 +7,7 @@ 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_}}, {{July 2018}})m4_dnl +m4_define({{_monthyear_}}, {{September 2018}})m4_dnl m4_define({{_version_}}, {{1.10.99}})m4_dnl m4_dnl m4_dnl Links to dev and recent release versions of a manual. diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 0ab956cbc..bb1b0768d 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 07d6eec88f8c0ba15f32b5bf4c9f74e54364b6da30852617699b496fbf3bf63a +-- hash: 7f5a11be3e9db0d4fcebb5b663ee988461de6d815042a7785f9076e083dde205 name: hledger-api -version: 1.10.99 +version: 1.11 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. @@ -45,7 +45,7 @@ executable hledger-api other-modules: Paths_hledger_api ghc-options: -threaded - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" build-depends: Decimal , aeson @@ -55,8 +55,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.10.99 && <1.11 - , hledger-lib >=1.10.99 && <1.11 + , hledger >=1.11 && <1.12 + , hledger-lib >=1.11 && <1.12 , 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 76e374f1f..db910dfdc 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -37,12 +37,12 @@ import Text.Printf import Hledger.Query import Hledger.Cli hiding (Reader, version) -hledgerApiVersion="1.10.99" +hledgerApiVersion="1.11" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.10.99 +hledger-api 1.11 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 5176abc71..672a757af 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.10.99' +version: '1.11' 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.10.99 && <1.11 -- hledger >=1.10.99 && <1.11 +- hledger-lib >=1.11 && <1.12 +- hledger >=1.11 && <1.12 - base >=4.8 && <4.12 - aeson - bytestring @@ -58,4 +58,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" diff --git a/hledger-install/hledger-install.sh b/hledger-install/hledger-install.sh index d9f77c7e3..382074383 100755 --- a/hledger-install/hledger-install.sh +++ b/hledger-install/hledger-install.sh @@ -58,11 +58,11 @@ RESOLVER="--resolver=lts-12" # avoid some unnecessary building. OSX Sierra+ requires at least lts-8.0. # lts-6 or 7 probably require tweaking the hledger install commands below. -HLEDGER_LIB_VERSION=1.10 -HLEDGER_VERSION=1.10 -HLEDGER_UI_VERSION=1.10.1 -HLEDGER_WEB_VERSION=1.10 -HLEDGER_API_VERSION=1.10 +HLEDGER_LIB_VERSION=1.11 +HLEDGER_VERSION=1.11 +HLEDGER_UI_VERSION=1.11 +HLEDGER_WEB_VERSION=1.11 +HLEDGER_API_VERSION=1.11 HLEDGER_DIFF_VERSION=0.2.0.14 HLEDGER_IADD_VERSION=1.3.6 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 921d64418..f04b8d85b 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 5d69eead3be5d0a10a8e272a4bdf63ba320e9e6914fae3d6031538bd8bd6206d +-- hash: f3cc307bb564ecec4c16143a1d254c4cbbbee1483eb7860c711e3c4c5ed46431 name: hledger-lib -version: 1.10.99 +version: 1.11 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 aa9a36a09..f2db477e7 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.10.99' +version: '1.11' 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 f83db7047..a2e0b6d56 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: fc23afcaa9a76cad46878b6bc6d6f9f6bb3f59623438031956b1d8cdb9315c17 +-- hash: d2925ba85674c61c233d118134f8b3cd090ca0900953652b4253755bb8840c9c name: hledger-ui -version: 1.10.99 +version: 1.11 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, @@ -63,7 +63,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.10.99" + cpp-options: -DVERSION="1.11" build-depends: ansi-terminal >=0.6.2.3 , async @@ -75,8 +75,8 @@ executable hledger-ui , directory , filepath , fsnotify >=0.2.1.2 && <0.4 - , hledger >=1.10.99 && <1.11 - , hledger-lib >=1.10.99 && <1.11 + , hledger >=1.11 && <1.12 + , hledger-lib >=1.11 && <1.12 , megaparsec >=6.4.1 && <7 , microlens >=0.4 , microlens-platform >=0.2.3.1 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index ac79b2667..7d500718a 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.10.99' +version : '1.11' 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.10.99" +cpp-options: -DVERSION="1.11" dependencies: -- hledger >=1.10.99 && <1.11 -- hledger-lib >=1.10.99 && <1.11 +- hledger >=1.11 && <1.12 +- hledger-lib >=1.11 && <1.12 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.12 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 2c5b97f0a..37b16f89a 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: f7bbdd2a2c0bf60f14a1c2d1538414933ed62708598213563167d021baba748b +-- hash: a990f6fed36d14942e007240e0b37a9ff1147902b74cadc426403828ce3950a6 name: hledger-web -version: 1.10.99 +version: 1.11 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 @@ -149,7 +149,7 @@ library other-modules: Paths_hledger_web ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" build-depends: base >=4.8 && <4.12 , blaze-html @@ -164,8 +164,8 @@ library , directory , filepath , hjsmin - , hledger >=1.10.99 && <1.11 - , hledger-lib >=1.10.99 && <1.11 + , hledger >=1.11 && <1.12 + , hledger-lib >=1.11 && <1.12 , http-client , http-conduit , json @@ -201,7 +201,7 @@ executable hledger-web hs-source-dirs: app ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 6edd856f5..744a94995 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.10.99' +version: '1.11' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -77,7 +77,7 @@ when: library: source-dirs: . - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -96,8 +96,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.10.99 && <1.11 - - hledger >=1.10.99 && <1.11 + - hledger-lib >=1.11 && <1.12 + - hledger >=1.11 && <1.12 - base >=4.8 && <4.12 - blaze-html - blaze-markup @@ -143,7 +143,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" dependencies: - base - hledger-web @@ -161,7 +161,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.10.99" +# cpp-options: -DVERSION="1.11" # dependencies: # - base # - hledger-web diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 1175d08f2..02454781d 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 70e6e178ba5d2d6601ebf07e79fdcc19d2480a0544225da23ee3155e928fd85c +-- hash: a53ed723ef2c43c6425e4bf2d40ae7a37b9816dcdbd49795a7a7972b4b4ca203 name: hledger -version: 1.10.99 +version: 1.11 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 @@ -111,7 +111,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.10.99" + cpp-options: -DVERSION="1.11" build-depends: Decimal , Diff @@ -129,7 +129,7 @@ library , hashable >=1.2.4 , haskeline >=0.6 , here - , hledger-lib >=1.10.99 && <1.11 + , hledger-lib >=1.11 && <1.12 , lucid , megaparsec >=6.4.1 && <7 , mtl @@ -164,7 +164,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.10.99" + cpp-options: -DVERSION="1.11" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -181,7 +181,7 @@ executable hledger , haskeline >=0.6 , here , hledger - , hledger-lib >=1.10.99 && <1.11 + , hledger-lib >=1.11 && <1.12 , megaparsec >=6.4.1 && <7 , mtl , mtl-compat @@ -218,7 +218,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.10.99" + cpp-options: -DVERSION="1.11" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -235,7 +235,7 @@ test-suite test , haskeline >=0.6 , here , hledger - , hledger-lib >=1.10.99 && <1.11 + , hledger-lib >=1.11 && <1.12 , megaparsec >=6.4.1 && <7 , mtl , mtl-compat @@ -289,7 +289,7 @@ benchmark bench , haskeline >=0.6 , here , hledger - , hledger-lib >=1.10.99 && <1.11 + , hledger-lib >=1.11 && <1.12 , html , megaparsec >=6.4.1 && <7 , mtl diff --git a/hledger/package.yaml b/hledger/package.yaml index b79cbab8d..a28739fb7 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.10.99' +version: '1.11' synopsis: Command-line interface for the hledger accounting tool description: | This is hledger's command-line interface. @@ -78,7 +78,7 @@ ghc-options: - -optP-Wno-nonportable-include-path dependencies: -- hledger-lib >=1.10.99 && <1.11 +- hledger-lib >=1.11 && <1.12 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.12 - base-compat-batteries >=0.10.1 && <0.11 @@ -121,7 +121,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -163,7 +163,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" when: - condition: flag(threaded) ghc-options: -threaded @@ -174,7 +174,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.10.99" + cpp-options: -DVERSION="1.11" dependencies: - hledger - test-framework