bump version to 1.1

This commit is contained in:
Simon Michael 2016-12-30 20:32:25 -08:00
parent 7ad31e65a1
commit 14c8e4d8f7
12 changed files with 70 additions and 69 deletions

View File

@ -7,8 +7,8 @@ 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_}}, {{October 2016}})m4_dnl m4_define({{_monthyear_}}, {{December 2016}})m4_dnl
m4_define({{_version_}}, {{1.0}})m4_dnl m4_define({{_version_}}, {{1.1}})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.
m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc. m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc.
@ -19,6 +19,7 @@ m4_define({{_versions_}},
This doc is for version **_version_**. This doc is for version **_version_**.
Available versions: Available versions:
<a href="$1.html">_version_</a> <a href="$1.html">_version_</a>
| <a href="doc/1.0/$1.html">1.0</a>
| <a href="doc/0.27/manual.html{{#}}$1">0.27</a> | <a href="doc/0.27/manual.html{{#}}$1">0.27</a>
</div>)m4_dnl </div>)m4_dnl
m4_dnl m4_dnl

View File

@ -1,9 +1,9 @@
-- This file has been generated from package.yaml by hpack version 0.14.0. -- This file has been generated from package.yaml by hpack version 0.15.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: hledger-api name: hledger-api
version: 1.0 version: 1.1
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.
@ -44,10 +44,10 @@ source-repository head
executable hledger-api executable hledger-api
main-is: hledger-api.hs main-is: hledger-api.hs
ghc-options: -threaded ghc-options: -threaded
cpp-options: -DVERSION="1.0" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
hledger-lib >= 1.0 && < 1.1 hledger-lib >= 1.1 && < 1.2
, hledger >= 1.0 && < 1.1 , hledger >= 1.1 && < 1.2
, base >=4.8 && <5 , base >=4.8 && <5
, aeson , aeson
, bytestring , bytestring

View File

@ -35,12 +35,12 @@ import Text.Printf
import Hledger.Query import Hledger.Query
import Hledger.Cli hiding (Reader, version) import Hledger.Cli hiding (Reader, version)
hledgerApiVersion="1.0" hledgerApiVersion="1.1"
-- 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.0 hledger-api 1.1
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.0' version: '1.1'
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.
@ -27,8 +27,8 @@ data-files:
- doc/hledger-api.1.txt - doc/hledger-api.1.txt
- doc/hledger-api.1.info - doc/hledger-api.1.info
dependencies: dependencies:
- hledger-lib >= 1.0 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- hledger >= 1.0 && < 1.1 - hledger >= 1.1 && < 1.2
- base >=4.8 && <5 - base >=4.8 && <5
- aeson - aeson
- bytestring - bytestring
@ -51,6 +51,6 @@ executables:
hledger-api: hledger-api:
main: hledger-api.hs main: hledger-api.hs
ghc-options: -threaded ghc-options: -threaded
cpp-options: -DVERSION="1.0" cpp-options: -DVERSION="1.1"
stability: alpha stability: alpha
tested-with: GHC==7.10.3, GHC==8.0 tested-with: GHC==7.10.3, GHC==8.0

View File

@ -1,9 +1,9 @@
-- This file has been generated from package.yaml by hpack version 0.14.0. -- This file has been generated from package.yaml by hpack version 0.15.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: hledger-lib name: hledger-lib
version: 1.0.1 version: 1.1
stability: stable stability: stable
category: Finance category: Finance
synopsis: Core data types, parsers and functionality for the hledger accounting tools synopsis: Core data types, parsers and functionality for the hledger accounting tools

View File

@ -1,5 +1,5 @@
name: hledger-lib name: hledger-lib
version: '1.0.1' version: '1.1'
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

@ -1,9 +1,9 @@
-- This file has been generated from package.yaml by hpack version 0.14.0. -- This file has been generated from package.yaml by hpack version 0.15.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: hledger-ui name: hledger-ui
version: 1.0.4 version: 1.1
stability: stable stability: stable
category: Finance, Console category: Finance, Console
synopsis: Curses-style user interface for the hledger accounting tool synopsis: Curses-style user interface for the hledger accounting tool
@ -55,10 +55,10 @@ 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.0.4" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
hledger >= 1.0.1 && < 1.1 hledger >= 1.1 && < 1.2
, hledger-lib >= 1.0.1 && < 1.1 , hledger-lib >= 1.1 && < 1.2
, ansi-terminal >= 0.6.2.3 && < 0.7 , ansi-terminal >= 0.6.2.3 && < 0.7
, async , async
, base >= 4.8 && < 5 , base >= 4.8 && < 5

View File

@ -1,5 +1,5 @@
name : hledger-ui name : hledger-ui
version : '1.0.4' version : '1.1'
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.
@ -35,7 +35,7 @@ flags:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false manual: false
default: false default: false
cpp-options: -DVERSION="1.0.4" cpp-options: -DVERSION="1.1"
executables: executables:
hledger-ui: hledger-ui:
source-dirs: . source-dirs: .
@ -48,8 +48,8 @@ executables:
-fno-warn-type-defaults -fno-warn-type-defaults
-fno-warn-orphans -fno-warn-orphans
dependencies: dependencies:
- hledger >= 1.0.1 && < 1.1 - hledger >= 1.1 && < 1.2
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- ansi-terminal >= 0.6.2.3 && < 0.7 - ansi-terminal >= 0.6.2.3 && < 0.7
- async - async
- base >= 4.8 && < 5 - base >= 4.8 && < 5

View File

@ -1,9 +1,9 @@
-- This file has been generated from package.yaml by hpack version 0.14.0. -- This file has been generated from package.yaml by hpack version 0.15.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: hledger-web name: hledger-web
version: 1.0.1 version: 1.1
stability: stable stability: stable
category: Finance category: Finance
synopsis: Web interface for the hledger accounting tool synopsis: Web interface for the hledger accounting tool
@ -125,10 +125,10 @@ flag threaded
library library
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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
hledger-lib >= 1.0.1 && < 1.1 hledger-lib >= 1.1 && < 1.2
, hledger >= 1.0.1 && < 1.1 , hledger >= 1.1 && < 1.2
, base >=4.8 && <5 , base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
, blaze-html , blaze-html
@ -199,10 +199,10 @@ executable hledger-web
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 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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
hledger-lib >= 1.0.1 && < 1.1 hledger-lib >= 1.1 && < 1.2
, hledger >= 1.0.1 && < 1.1 , hledger >= 1.1 && < 1.2
, base >=4.8 && <5 , base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
, blaze-html , blaze-html
@ -234,7 +234,7 @@ executable hledger-web
, yesod-static , yesod-static
, json , json
, parsec >=3 , parsec >=3
, hledger-web == 1.0.1 , hledger-web == 1.1
if flag(library-only) if flag(library-only)
buildable: False buildable: False
if flag(threaded) if flag(threaded)
@ -264,10 +264,10 @@ test-suite test
hs-source-dirs: hs-source-dirs:
tests tests
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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
hledger-lib >= 1.0.1 && < 1.1 hledger-lib >= 1.1 && < 1.2
, hledger >= 1.0.1 && < 1.1 , hledger >= 1.1 && < 1.2
, base >=4.8 && <5 , base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
, blaze-html , blaze-html
@ -298,7 +298,7 @@ test-suite test
, yesod-form , yesod-form
, yesod-static , yesod-static
, json , json
, hledger-web == 1.0.1 , hledger-web == 1.1
, hspec , hspec
, yesod-test , yesod-test
if flag(oldtime) if flag(oldtime)

View File

@ -1,5 +1,5 @@
name: hledger-web name: hledger-web
version: '1.0.1' version: '1.1'
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.
@ -60,8 +60,8 @@ flags:
manual: false manual: false
default: false default: false
dependencies: dependencies:
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- hledger >= 1.0.1 && < 1.1 - hledger >= 1.1 && < 1.2
- base >=4.8 && <5 - base >=4.8 && <5
- base-compat >=0.8.1 - base-compat >=0.8.1
- blaze-html - blaze-html
@ -100,7 +100,7 @@ ghc-options:
- -fno-warn-type-defaults - -fno-warn-type-defaults
- -fno-warn-orphans - -fno-warn-orphans
library: library:
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
exposed-modules: exposed-modules:
- Application - Application
- Foundation - Foundation
@ -139,10 +139,10 @@ executables:
hledger-web: hledger-web:
main: main.hs main: main.hs
source-dirs: app source-dirs: app
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
dependencies: dependencies:
- parsec >=3 - parsec >=3
- hledger-web == 1.0.1 - hledger-web == 1.1
when: when:
- condition: flag(library-only) - condition: flag(library-only)
buildable: false buildable: false
@ -167,9 +167,9 @@ tests:
test: test:
main: main.hs main: main.hs
source-dirs: tests source-dirs: tests
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
dependencies: dependencies:
- hledger-web == 1.0.1 - hledger-web == 1.1
- hspec - hspec
- yesod-test - yesod-test
when: when:

View File

@ -1,9 +1,9 @@
-- This file has been generated from package.yaml by hpack version 0.14.0. -- This file has been generated from package.yaml by hpack version 0.15.0.
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: hledger name: hledger
version: 1.0.1 version: 1.1
stability: stable stability: stable
category: Finance, Console category: Finance, Console
synopsis: Command-line interface for the hledger accounting tool synopsis: Command-line interface for the hledger accounting tool
@ -80,7 +80,7 @@ flag threaded
library library
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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
base >=4.8 && <5 base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
@ -91,7 +91,7 @@ library
, process , process
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.0.1 && < 1.1 , hledger-lib >= 1.1 && < 1.2
, bytestring , bytestring
, containers , containers
, unordered-containers , unordered-containers
@ -163,7 +163,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 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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
base >=4.8 && <5 base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
@ -174,8 +174,8 @@ executable hledger
, process , process
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.0.1 && < 1.1 , hledger-lib >= 1.1 && < 1.2
, hledger == 1.0.1 , hledger == 1.1
, bytestring , bytestring
, containers , containers
, unordered-containers , unordered-containers
@ -224,7 +224,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 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.0.1" cpp-options: -DVERSION="1.1"
build-depends: build-depends:
base >=4.8 && <5 base >=4.8 && <5
, base-compat >=0.8.1 , base-compat >=0.8.1
@ -235,8 +235,8 @@ test-suite test
, process , process
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.0.1 && < 1.1 , hledger-lib >= 1.1 && < 1.2
, hledger == 1.0.1 , hledger == 1.1
, bytestring , bytestring
, containers , containers
, unordered-containers , unordered-containers
@ -296,8 +296,8 @@ benchmark bench
, process , process
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.0.1 && < 1.1 , hledger-lib >= 1.1 && < 1.2
, hledger == 1.0.1 , hledger == 1.1
, criterion , criterion
, html , html
, timeit , timeit

View File

@ -1,5 +1,5 @@
name: hledger name: hledger
version: '1.0.1' version: '1.1'
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.
@ -80,7 +80,7 @@ ghc-options:
- -fno-warn-type-defaults - -fno-warn-type-defaults
- -fno-warn-orphans - -fno-warn-orphans
library: library:
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
exposed-modules: exposed-modules:
- Hledger.Cli - Hledger.Cli
- Hledger.Cli.Main - Hledger.Cli.Main
@ -104,7 +104,7 @@ library:
- Hledger.Cli.Stats - Hledger.Cli.Stats
- Text.Tabular.AsciiWide - Text.Tabular.AsciiWide
dependencies: dependencies:
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- bytestring - bytestring
- containers - containers
- unordered-containers - unordered-containers
@ -152,10 +152,10 @@ executables:
hledger: hledger:
main: hledger-cli.hs main: hledger-cli.hs
source-dirs: app source-dirs: app
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
dependencies: dependencies:
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- hledger == 1.0.1 - hledger == 1.1
- bytestring - bytestring
- containers - containers
- unordered-containers - unordered-containers
@ -203,10 +203,10 @@ tests:
test: test:
main: test.hs main: test.hs
source-dirs: test source-dirs: test
cpp-options: -DVERSION="1.0.1" cpp-options: -DVERSION="1.1"
dependencies: dependencies:
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- hledger == 1.0.1 - hledger == 1.1
- bytestring - bytestring
- containers - containers
- unordered-containers - unordered-containers
@ -255,8 +255,8 @@ benchmarks:
main: bench.hs main: bench.hs
source-dirs: bench source-dirs: bench
dependencies: dependencies:
- hledger-lib >= 1.0.1 && < 1.1 - hledger-lib >= 1.1 && < 1.2
- hledger == 1.0.1 - hledger == 1.1
- criterion - criterion
- html - html
- timeit - timeit