diff --git a/.version b/.version index e3920ffa9..809bdcb85 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.11.99 +1.12 diff --git a/Shake.hs b/Shake.hs index 1dd60c115..289aafda4 100755 --- a/Shake.hs +++ b/Shake.hs @@ -138,7 +138,7 @@ main = do webmanpages = ["site" manpageNameToUri m <.> "md" | m <- manpageNames] -- versions of documentation (excluding 0.27) - docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11" ] + docversions = [ "1.0" , "1.1" , "1.2" , "1.3" , "1.4" , "1.5" , "1.9", "1.10", "1.11", "1.12" ] -- manuals rendered to html by pandoc webhtmlpages diff --git a/doc/lib.m4 b/doc/lib.m4 index 80c078f28..bce031d12 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -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_dnl m4_define({{_author_}}, {{}})m4_dnl -m4_define({{_monthyear_}}, {{September 2018}})m4_dnl -m4_define({{_version_}}, {{1.11.99}})m4_dnl +m4_define({{_monthyear_}}, {{December 2018}})m4_dnl +m4_define({{_version_}}, {{1.12}})m4_dnl m4_dnl 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. diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index ec5b14425..52013121e 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: 9a4689262776b01e2b52c1aea3e473b3b94b18a79a4e5f5722bdaf48e14df1e5 +-- hash: 2568034d40718576decaeee8d4cc375ed16568df787da9eef3ed8664bd3184ad name: hledger-api -version: 1.11.99 +version: 1.12 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.11.99" + cpp-options: -DVERSION="1.12" build-depends: Decimal , aeson @@ -56,8 +56,8 @@ executable hledger-api , data-default >=0.5 , docopt , either - , hledger >=1.11.99 && <1.12 - , hledger-lib >=1.11.99 && <1.12 + , hledger >=1.12 && <1.13 + , hledger-lib >=1.12 && <1.13 , 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 880650d26..1f4a1d143 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.11.99" +hledgerApiVersion="1.12" -- https://github.com/docopt/docopt.hs#readme doc :: Docopt doc = [docopt| -hledger-api 1.11.99 +hledger-api 1.12 Serves hledger data and reports as a JSON web API. diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index eada0cc48..d43bae1ea 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -1,5 +1,5 @@ name: hledger-api -version: '1.11.99' +version: '1.12' 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.11.99 && <1.12 -- hledger >=1.11.99 && <1.12 +- hledger-lib >=1.12 && <1.13 +- hledger >=1.12 && <1.13 - 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.11.99" + cpp-options: -DVERSION="1.12" diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 2dca824e3..9e0a152b3 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: ae5e73c091e30c202086784f5bc6fc55cd31198c284be23ec13750ad4f2de6ef +-- hash: 8e0ce73c7c86c909a78d4d06e8566f8b66bc1df89f508da0b05df073c4ecd7c9 name: hledger-lib -version: 1.11.99 +version: 1.12 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 ea27d4329..5f414df99 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -1,5 +1,5 @@ name: hledger-lib -version: '1.11.99' +version: '1.12' 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 1a51a400c..7c2e23eea 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: 5e4bfca54b6db22da98dd0182785240d2f89ae97b32433027b1ed144d8398c4f +-- hash: 1abfa4ed0acf79d9240fa75603c4070b640238aa22fa2895a8e3d6155c33a481 name: hledger-ui -version: 1.11.99 +version: 1.12 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.11.99" + cpp-options: -DVERSION="1.12" 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.11.99 && <1.12 - , hledger-lib >=1.11.99 && <1.12 + , hledger >=1.12 && <1.13 + , hledger-lib >=1.12 && <1.13 , 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 73a0642d6..2b3e6a702 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -1,5 +1,5 @@ name : hledger-ui -version : '1.11.99' +version : '1.12' 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.11.99" +cpp-options: -DVERSION="1.12" dependencies: -- hledger >=1.11.99 && <1.12 -- hledger-lib >=1.11.99 && <1.12 +- hledger >=1.12 && <1.13 +- hledger-lib >=1.12 && <1.13 - ansi-terminal >=0.6.2.3 - async - base >=4.8 && <4.13 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index b67dd42ee..f8c3a24d3 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: e4136e80ffc0f91a70be9ba2c2051cd80b2580f67c01bdb4d311a07d202c0a47 +-- hash: 5561e1638c4aa51f58f3983ce8187999995f3e67b5cd8654e8cc2f71a8bbb7da name: hledger-web -version: 1.11.99 +version: 1.12 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 @@ -150,7 +150,7 @@ library hs-source-dirs: ./. ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" build-depends: base >=4.8 && <4.13 , blaze-html @@ -165,8 +165,8 @@ library , directory , filepath , hjsmin - , hledger >=1.11.99 && <1.12 - , hledger-lib >=1.11.99 && <1.12 + , hledger >=1.12 && <1.13 + , hledger-lib >=1.12 && <1.13 , http-client , http-conduit , json @@ -206,7 +206,7 @@ executable hledger-web hs-source-dirs: app ghc-options: -Wall -fwarn-tabs - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" build-depends: base , hledger-web diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 6ebfe65a5..7d559f860 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -1,5 +1,5 @@ name: hledger-web -version: '1.11.99' +version: '1.12' synopsis: Web interface for the hledger accounting tool description: | This is hledger's web interface. @@ -76,7 +76,7 @@ when: library: source-dirs: . - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" exposed-modules: - Hledger.Web - Hledger.Web.Application @@ -95,8 +95,8 @@ library: - Hledger.Web.Widget.AddForm - Hledger.Web.Widget.Common dependencies: - - hledger-lib >=1.11.99 && <1.12 - - hledger >=1.11.99 && <1.12 + - hledger-lib >=1.12 && <1.13 + - hledger >=1.12 && <1.13 - base >=4.8 && <4.13 - blaze-html - blaze-markup @@ -142,7 +142,7 @@ executables: hledger-web: source-dirs: app main: main.hs - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" dependencies: - base - hledger-web @@ -159,7 +159,7 @@ executables: # test: # source-dirs: tests # main: main.hs -# cpp-options: -DVERSION="1.11.99" +# cpp-options: -DVERSION="1.12" # dependencies: # - base # - hledger-web diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 17fff545a..17310eec8 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 0c493cc89b0b040504bc5dfad3504ba6f45d6a93042361aa52838e7ee0563be4 +-- hash: 459ec44c2ae4fd1a0f7e0f8001c3efae2a39ff8b1ef53baa0a510b0674e98c2c name: hledger -version: 1.11.99 +version: 1.12 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 @@ -112,7 +112,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.11.99" + cpp-options: -DVERSION="1.12" build-depends: Decimal , Diff @@ -130,7 +130,7 @@ library , hashable >=1.2.4 , haskeline >=0.6 , here - , hledger-lib >=1.11.99 && <1.12 + , hledger-lib >=1.12 && <1.13 , lucid , megaparsec >=7.0.0 && <8 , mtl @@ -165,7 +165,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.11.99" + cpp-options: -DVERSION="1.12" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -182,7 +182,7 @@ executable hledger , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11.99 && <1.12 + , hledger-lib >=1.12 && <1.13 , megaparsec >=7.0.0 && <8 , mtl , mtl-compat @@ -219,7 +219,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.11.99" + cpp-options: -DVERSION="1.12" build-depends: Decimal , ansi-terminal >=0.6.2.3 @@ -236,7 +236,7 @@ test-suite test , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11.99 && <1.12 + , hledger-lib >=1.12 && <1.13 , megaparsec >=7.0.0 && <8 , mtl , mtl-compat @@ -290,7 +290,7 @@ benchmark bench , haskeline >=0.6 , here , hledger - , hledger-lib >=1.11.99 && <1.12 + , hledger-lib >=1.12 && <1.13 , html , megaparsec >=7.0.0 && <8 , mtl diff --git a/hledger/package.yaml b/hledger/package.yaml index a9d3563c8..156671600 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -1,5 +1,5 @@ name: hledger -version: '1.11.99' +version: '1.12' 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.11.99 && <1.12 +- hledger-lib >=1.12 && <1.13 - ansi-terminal >=0.6.2.3 - base >=4.8 && <4.13 - base-compat-batteries >=0.10.1 && <0.11 @@ -121,7 +121,7 @@ when: - terminfo library: - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" exposed-modules: - Hledger.Cli - Hledger.Cli.Main @@ -163,7 +163,7 @@ executables: hledger: source-dirs: app main: hledger-cli.hs - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" when: - condition: flag(threaded) ghc-options: -threaded @@ -174,7 +174,7 @@ tests: test: source-dirs: test main: test.hs - cpp-options: -DVERSION="1.11.99" + cpp-options: -DVERSION="1.12" dependencies: - hledger - test-framework