diff --git a/hledger-api/.version b/hledger-api/.version index 07fe6f6c9..a6874e690 100644 --- a/hledger-api/.version +++ b/hledger-api/.version @@ -1 +1 @@ -1.15 \ No newline at end of file +1.14.99 \ No newline at end of file diff --git a/hledger-api/CHANGES.md b/hledger-api/CHANGES.md index 999e5b96e..accf22e6f 100644 --- a/hledger-api/CHANGES.md +++ b/hledger-api/CHANGES.md @@ -3,13 +3,9 @@ See also the hledger changelog. # da671880 +- allow hledger 1.15 - -- api: set upper bound for swagger2 - - - -- use hledger 1.15 +- set upper bound for swagger2 # 1.14 2019-03-01 diff --git a/hledger-api/README b/hledger-api/README index d55d873e1..69e217c1d 100644 --- a/hledger-api/README +++ b/hledger-api/README @@ -1,2 +1,6 @@ A web API server for hledger data, and some client-side app examples. This is an alternative to hledger-web, and for variety uses servant instead of yesod. + +As of 2019-09, this has been retired in favour of hledger-web. +hledger-web 1.15+ includes hledger-api's functionality plus +newer updates. diff --git a/hledger-api/defs.m4 b/hledger-api/defs.m4 index 28594ae78..a55b70425 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.15}})m4_dnl +m4_define({{_version_}}, {{1.14.99}})m4_dnl m4_dnl m4_dnl Date to show in man pages. Updated by make setdate. -m4_define({{_monthyear_}}, {{August 2019}})m4_dnl +m4_define({{_monthyear_}}, {{March 2019}})m4_dnl diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index f5e3d4cb0..6a5062bbd 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: abc0cf2dc37fed2028d3e6ead7e20d838b74f598bf8fa421130fd47f91d845f6 +-- hash: 6fd285878e745126685613c29db2e0e5c70f9422971ff64f844da7c01567baed name: hledger-api -version: 1.15 +version: 1.14.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. @@ -15,7 +15,7 @@ description: This is a simple web API server for hledger data. hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web + with ledger(1). hledger provides command-line, terminal and web interfaces, and aims to be a reliable, practical tool for daily use. category: Finance @@ -46,7 +46,7 @@ executable hledger-api other-modules: Paths_hledger_api ghc-options: -threaded - cpp-options: -DVERSION="1.15" + cpp-options: -DVERSION="1.14.99" build-depends: Decimal , aeson @@ -56,8 +56,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.15 && <1.16 - , hledger-lib >=1.15 && <1.16 + , hledger >=1.14.2 && <1.16 + , hledger-lib >=1.14.1 && <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 ee83dd9a3..226aa4d52 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: 1.15 +version: 1.14.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 @@ extra-source-files: #data-files: dependencies: -- hledger-lib >=1.15 && <1.16 -- hledger >=1.15 && <1.16 +- hledger-lib >=1.14.1 && <1.16 +- hledger >=1.14.2 && <1.16 - base >=4.8 && <4.13 - aeson - bytestring @@ -58,4 +58,4 @@ executables: hledger-api: main: hledger-api.hs ghc-options: -threaded - cpp-options: -DVERSION="1.15" + cpp-options: -DVERSION="1.14.99"