bump version to 1.11

This commit is contained in:
Simon Michael 2018-09-30 20:07:45 -10:00
parent 92c8a6fffb
commit b798c48040
14 changed files with 56 additions and 56 deletions

View File

@ -1 +1 @@
1.10.99 1.11

View File

@ -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_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl
m4_dnl m4_dnl
m4_define({{_author_}}, {{}})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_define({{_version_}}, {{1.10.99}})m4_dnl
m4_dnl m4_dnl
m4_dnl Links to dev and recent release versions of a manual. m4_dnl Links to dev and recent release versions of a manual.

View File

@ -2,10 +2,10 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 07d6eec88f8c0ba15f32b5bf4c9f74e54364b6da30852617699b496fbf3bf63a -- hash: 7f5a11be3e9db0d4fcebb5b663ee988461de6d815042a7785f9076e083dde205
name: hledger-api name: hledger-api
version: 1.10.99 version: 1.11
synopsis: Web API server for the hledger accounting tool synopsis: Web API server for the hledger accounting tool
description: This is a simple web API server for hledger data. description: This is a simple web API server for hledger data.
It comes with a series of simple client-side web app examples. It comes with a series of simple client-side web app examples.
@ -45,7 +45,7 @@ executable hledger-api
other-modules: other-modules:
Paths_hledger_api Paths_hledger_api
ghc-options: -threaded ghc-options: -threaded
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
build-depends: build-depends:
Decimal Decimal
, aeson , aeson
@ -55,8 +55,8 @@ executable hledger-api
, data-default >=0.5 , data-default >=0.5
, docopt , docopt
, either , either
, hledger >=1.10.99 && <1.11 , hledger >=1.11 && <1.12
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, microlens >=0.4 , microlens >=0.4
, microlens-platform >=0.2.3.1 , microlens-platform >=0.2.3.1
, safe , safe

View File

@ -37,12 +37,12 @@ import Text.Printf
import Hledger.Query import Hledger.Query
import Hledger.Cli hiding (Reader, version) import Hledger.Cli hiding (Reader, version)
hledgerApiVersion="1.10.99" hledgerApiVersion="1.11"
-- https://github.com/docopt/docopt.hs#readme -- https://github.com/docopt/docopt.hs#readme
doc :: Docopt doc :: Docopt
doc = [docopt| doc = [docopt|
hledger-api 1.10.99 hledger-api 1.11
Serves hledger data and reports as a JSON web API. Serves hledger data and reports as a JSON web API.

View File

@ -1,5 +1,5 @@
name: hledger-api name: hledger-api
version: '1.10.99' version: '1.11'
synopsis: Web API server for the hledger accounting tool synopsis: Web API server for the hledger accounting tool
description: | description: |
This is a simple web API server for hledger data. This is a simple web API server for hledger data.
@ -32,8 +32,8 @@ extra-source-files:
#data-files: #data-files:
dependencies: dependencies:
- hledger-lib >=1.10.99 && <1.11 - hledger-lib >=1.11 && <1.12
- hledger >=1.10.99 && <1.11 - hledger >=1.11 && <1.12
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- aeson - aeson
- bytestring - bytestring
@ -58,4 +58,4 @@ executables:
hledger-api: hledger-api:
main: hledger-api.hs main: hledger-api.hs
ghc-options: -threaded ghc-options: -threaded
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"

View File

@ -58,11 +58,11 @@ RESOLVER="--resolver=lts-12"
# avoid some unnecessary building. OSX Sierra+ requires at least lts-8.0. # avoid some unnecessary building. OSX Sierra+ requires at least lts-8.0.
# lts-6 or 7 probably require tweaking the hledger install commands below. # lts-6 or 7 probably require tweaking the hledger install commands below.
HLEDGER_LIB_VERSION=1.10 HLEDGER_LIB_VERSION=1.11
HLEDGER_VERSION=1.10 HLEDGER_VERSION=1.11
HLEDGER_UI_VERSION=1.10.1 HLEDGER_UI_VERSION=1.11
HLEDGER_WEB_VERSION=1.10 HLEDGER_WEB_VERSION=1.11
HLEDGER_API_VERSION=1.10 HLEDGER_API_VERSION=1.11
HLEDGER_DIFF_VERSION=0.2.0.14 HLEDGER_DIFF_VERSION=0.2.0.14
HLEDGER_IADD_VERSION=1.3.6 HLEDGER_IADD_VERSION=1.3.6

View File

@ -2,10 +2,10 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 5d69eead3be5d0a10a8e272a4bdf63ba320e9e6914fae3d6031538bd8bd6206d -- hash: f3cc307bb564ecec4c16143a1d254c4cbbbee1483eb7860c711e3c4c5ed46431
name: hledger-lib name: hledger-lib
version: 1.10.99 version: 1.11
synopsis: Core data types, parsers and functionality for the hledger accounting tools synopsis: Core data types, parsers and functionality for the hledger accounting tools
description: This is a reusable library containing hledger's core functionality. description: This is a reusable library containing hledger's core functionality.
. .

View File

@ -1,5 +1,5 @@
name: hledger-lib name: hledger-lib
version: '1.10.99' version: '1.11'
synopsis: Core data types, parsers and functionality for the hledger accounting tools synopsis: Core data types, parsers and functionality for the hledger accounting tools
description: | description: |
This is a reusable library containing hledger's core functionality. This is a reusable library containing hledger's core functionality.

View File

@ -2,10 +2,10 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: fc23afcaa9a76cad46878b6bc6d6f9f6bb3f59623438031956b1d8cdb9315c17 -- hash: d2925ba85674c61c233d118134f8b3cd090ca0900953652b4253755bb8840c9c
name: hledger-ui name: hledger-ui
version: 1.10.99 version: 1.11
synopsis: Curses-style user interface for the hledger accounting tool synopsis: Curses-style user interface for the hledger accounting tool
description: This is hledger's curses-style interface. description: This is hledger's curses-style interface.
It is simpler and more convenient for browsing data than the command-line 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: 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 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: build-depends:
ansi-terminal >=0.6.2.3 ansi-terminal >=0.6.2.3
, async , async
@ -75,8 +75,8 @@ executable hledger-ui
, directory , directory
, filepath , filepath
, fsnotify >=0.2.1.2 && <0.4 , fsnotify >=0.2.1.2 && <0.4
, hledger >=1.10.99 && <1.11 , hledger >=1.11 && <1.12
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, megaparsec >=6.4.1 && <7 , megaparsec >=6.4.1 && <7
, microlens >=0.4 , microlens >=0.4
, microlens-platform >=0.2.3.1 , microlens-platform >=0.2.3.1

View File

@ -1,5 +1,5 @@
name : hledger-ui name : hledger-ui
version : '1.10.99' version : '1.11'
synopsis : Curses-style user interface for the hledger accounting tool synopsis : Curses-style user interface for the hledger accounting tool
description : | description : |
This is hledger's curses-style interface. This is hledger's curses-style interface.
@ -37,11 +37,11 @@ flags:
manual: false manual: false
default: true default: true
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
dependencies: dependencies:
- hledger >=1.10.99 && <1.11 - hledger >=1.11 && <1.12
- hledger-lib >=1.10.99 && <1.11 - hledger-lib >=1.11 && <1.12
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- async - async
- base >=4.8 && <4.12 - base >=4.8 && <4.12

View File

@ -2,10 +2,10 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: f7bbdd2a2c0bf60f14a1c2d1538414933ed62708598213563167d021baba748b -- hash: a990f6fed36d14942e007240e0b37a9ff1147902b74cadc426403828ce3950a6
name: hledger-web name: hledger-web
version: 1.10.99 version: 1.11
synopsis: Web interface for the hledger accounting tool synopsis: Web interface for the hledger accounting tool
description: This is hledger's web interface. description: This is hledger's web interface.
It provides a more user-friendly and collaborative UI than the It provides a more user-friendly and collaborative UI than the
@ -149,7 +149,7 @@ library
other-modules: other-modules:
Paths_hledger_web Paths_hledger_web
ghc-options: -Wall -fwarn-tabs ghc-options: -Wall -fwarn-tabs
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
build-depends: build-depends:
base >=4.8 && <4.12 base >=4.8 && <4.12
, blaze-html , blaze-html
@ -164,8 +164,8 @@ library
, directory , directory
, filepath , filepath
, hjsmin , hjsmin
, hledger >=1.10.99 && <1.11 , hledger >=1.11 && <1.12
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, http-client , http-client
, http-conduit , http-conduit
, json , json
@ -201,7 +201,7 @@ executable hledger-web
hs-source-dirs: hs-source-dirs:
app app
ghc-options: -Wall -fwarn-tabs ghc-options: -Wall -fwarn-tabs
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
build-depends: build-depends:
base base
, hledger-web , hledger-web

View File

@ -1,5 +1,5 @@
name: hledger-web name: hledger-web
version: '1.10.99' version: '1.11'
synopsis: Web interface for the hledger accounting tool synopsis: Web interface for the hledger accounting tool
description: | description: |
This is hledger's web interface. This is hledger's web interface.
@ -77,7 +77,7 @@ when:
library: library:
source-dirs: . source-dirs: .
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
exposed-modules: exposed-modules:
- Hledger.Web - Hledger.Web
- Hledger.Web.Application - Hledger.Web.Application
@ -96,8 +96,8 @@ library:
- Hledger.Web.Widget.AddForm - Hledger.Web.Widget.AddForm
- Hledger.Web.Widget.Common - Hledger.Web.Widget.Common
dependencies: dependencies:
- hledger-lib >=1.10.99 && <1.11 - hledger-lib >=1.11 && <1.12
- hledger >=1.10.99 && <1.11 - hledger >=1.11 && <1.12
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- blaze-html - blaze-html
- blaze-markup - blaze-markup
@ -143,7 +143,7 @@ executables:
hledger-web: hledger-web:
source-dirs: app source-dirs: app
main: main.hs main: main.hs
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
dependencies: dependencies:
- base - base
- hledger-web - hledger-web
@ -161,7 +161,7 @@ executables:
# test: # test:
# source-dirs: tests # source-dirs: tests
# main: main.hs # main: main.hs
# cpp-options: -DVERSION="1.10.99" # cpp-options: -DVERSION="1.11"
# dependencies: # dependencies:
# - base # - base
# - hledger-web # - hledger-web

View File

@ -2,10 +2,10 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 70e6e178ba5d2d6601ebf07e79fdcc19d2480a0544225da23ee3155e928fd85c -- hash: a53ed723ef2c43c6425e4bf2d40ae7a37b9816dcdbd49795a7a7972b4b4ca203
name: hledger name: hledger
version: 1.10.99 version: 1.11
synopsis: Command-line interface for the hledger accounting tool synopsis: Command-line interface for the hledger accounting tool
description: This is hledger's command-line interface. description: This is hledger's command-line interface.
Its basic function is to read a plain text file describing Its basic function is to read a plain text file describing
@ -111,7 +111,7 @@ library
other-modules: other-modules:
Paths_hledger 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 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: build-depends:
Decimal Decimal
, Diff , Diff
@ -129,7 +129,7 @@ library
, hashable >=1.2.4 , hashable >=1.2.4
, haskeline >=0.6 , haskeline >=0.6
, here , here
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, lucid , lucid
, megaparsec >=6.4.1 && <7 , megaparsec >=6.4.1 && <7
, mtl , mtl
@ -164,7 +164,7 @@ executable hledger
hs-source-dirs: hs-source-dirs:
app 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 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: build-depends:
Decimal Decimal
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
@ -181,7 +181,7 @@ executable hledger
, haskeline >=0.6 , haskeline >=0.6
, here , here
, hledger , hledger
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, megaparsec >=6.4.1 && <7 , megaparsec >=6.4.1 && <7
, mtl , mtl
, mtl-compat , mtl-compat
@ -218,7 +218,7 @@ test-suite test
hs-source-dirs: hs-source-dirs:
test 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 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: build-depends:
Decimal Decimal
, ansi-terminal >=0.6.2.3 , ansi-terminal >=0.6.2.3
@ -235,7 +235,7 @@ test-suite test
, haskeline >=0.6 , haskeline >=0.6
, here , here
, hledger , hledger
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, megaparsec >=6.4.1 && <7 , megaparsec >=6.4.1 && <7
, mtl , mtl
, mtl-compat , mtl-compat
@ -289,7 +289,7 @@ benchmark bench
, haskeline >=0.6 , haskeline >=0.6
, here , here
, hledger , hledger
, hledger-lib >=1.10.99 && <1.11 , hledger-lib >=1.11 && <1.12
, html , html
, megaparsec >=6.4.1 && <7 , megaparsec >=6.4.1 && <7
, mtl , mtl

View File

@ -1,5 +1,5 @@
name: hledger name: hledger
version: '1.10.99' version: '1.11'
synopsis: Command-line interface for the hledger accounting tool synopsis: Command-line interface for the hledger accounting tool
description: | description: |
This is hledger's command-line interface. This is hledger's command-line interface.
@ -78,7 +78,7 @@ ghc-options:
- -optP-Wno-nonportable-include-path - -optP-Wno-nonportable-include-path
dependencies: dependencies:
- hledger-lib >=1.10.99 && <1.11 - hledger-lib >=1.11 && <1.12
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat-batteries >=0.10.1 && <0.11 - base-compat-batteries >=0.10.1 && <0.11
@ -121,7 +121,7 @@ when:
- terminfo - terminfo
library: library:
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
exposed-modules: exposed-modules:
- Hledger.Cli - Hledger.Cli
- Hledger.Cli.Main - Hledger.Cli.Main
@ -163,7 +163,7 @@ executables:
hledger: hledger:
source-dirs: app source-dirs: app
main: hledger-cli.hs main: hledger-cli.hs
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
when: when:
- condition: flag(threaded) - condition: flag(threaded)
ghc-options: -threaded ghc-options: -threaded
@ -174,7 +174,7 @@ tests:
test: test:
source-dirs: test source-dirs: test
main: test.hs main: test.hs
cpp-options: -DVERSION="1.10.99" cpp-options: -DVERSION="1.11"
dependencies: dependencies:
- hledger - hledger
- test-framework - test-framework