bump version to 1.10.99 (dev)

2018-07-04 13:32:42 +01:00 · 2018-07-04 13:32:42 +01:00 · d62f082bce
commit d62f082bce
parent 1e27675c7d
13 changed files with 52 additions and 52 deletions
--- a/.version
+++ b/.version
@ -1 +1 @@
-1.10
+1.10.99
--- 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_}}, {{June 2018}})m4_dnl
+m4_define({{_monthyear_}}, {{July 2018}})m4_dnl
 m4_define({{_version_}}, {{1.10}})m4_dnl
 m4_dnl
 m4_dnl Links to dev and recent release versions of a manual.
@ -15,7 +15,7 @@ m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc.
 m4_dnl The current version is hidden (or whatever) by highlightDocVersion in site.js.
 m4_dnl
 m4_define({{_docversionlinks_}},m4_dnl
-This doc is for version **_version_**.
+This doc is for version **_version_** (dev).
 <span class="docversions">m4_dnl
 m4_dnl Too painful for static generation, insert from site.js instead
 m4_dnl Available versions:
--- a/hledger-api/hledger-api.cabal
+++ b/hledger-api/hledger-api.cabal
@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 2acd31f63b652f44450cca4ab0448c41091d934449a7c47e1423c6526dd36e72
+-- hash: a4c2b5377d201c4d4f2e490b780ccff644827ad1b0b073ee4dd5dad917cc7db5

 name:           hledger-api
-version:        1.10
+version:        1.10.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.
@ -45,7 +45,7 @@ executable hledger-api
  other-modules:
      Paths_hledger_api
  ghc-options: -threaded
-  cpp-options: -DVERSION="1.10"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      Decimal
    , aeson
@ -55,8 +55,8 @@ executable hledger-api
    , data-default >=0.5
    , docopt
    , either
-    , hledger >=1.10 && <1.11
-    , hledger-lib >=1.10 && <1.11
+    , hledger >=1.10.99 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , microlens >=0.4
    , microlens-platform >=0.2.3.1
    , safe
--- 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"
+hledgerApiVersion="1.10.99"

 -- https://github.com/docopt/docopt.hs#readme
 doc :: Docopt
 doc = [docopt|
-hledger-api 1.10
+hledger-api 1.10.99

 Serves hledger data and reports as a JSON web API.

--- a/hledger-api/package.yaml
+++ b/hledger-api/package.yaml
@ -1,5 +1,5 @@
 name: hledger-api
-version: '1.10'
+version: '1.10.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.10 && <1.11
- hledger >=1.10 && <1.11
+- hledger-lib >=1.10.99 && <1.11
+- hledger >=1.10.99 && <1.11
 - 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"
+    cpp-options: -DVERSION="1.10.99"
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 757469e81007e12da21192dc913e3abfe79ca36c62479f7d08abc8726656b4c1
+-- hash: 0d06b98a1e8163de682c1b719a86583bda63677b613a54eaf62778dea185dcb4

 name:           hledger-lib
-version:        1.10
+version:        1.10.99
 synopsis:       Core data types, parsers and functionality for the hledger accounting tools
 description:    This is a reusable library containing hledger's core functionality.
                .
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@ -1,5 +1,5 @@
 name: hledger-lib
-version: '1.10'
+version: '1.10.99'
 synopsis: Core data types, parsers and functionality for the hledger accounting tools
 description: |
  This is a reusable library containing hledger's core functionality.
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 6d33330b300e0157396548bad1c303fa608cb5f611d108f4f0080e130b12c04e
+-- hash: d1bcfc2bad2b9f2114002a466f18bc1ecfb1f80209a98191cf5f4f3750decc75

 name:           hledger-ui
-version:        1.10.1
+version:        1.10.99
 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.1"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      HUnit
    , ansi-terminal >=0.6.2.3
@ -76,8 +76,8 @@ executable hledger-ui
    , directory
    , filepath
    , fsnotify >=0.2.1.2 && <0.4
-    , hledger >=1.10 && <1.11
-    , hledger-lib >=1.10 && <1.11
+    , hledger >=1.10.99 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , megaparsec >=6.4.1
    , microlens >=0.4
    , microlens-platform >=0.2.3.1
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@ -1,5 +1,5 @@
 name        : hledger-ui
-version     : '1.10.1'
+version     : '1.10.99'
 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.1"
+cpp-options: -DVERSION="1.10.99"

 dependencies:
- hledger >=1.10 && <1.11
- hledger-lib >=1.10 && <1.11
+- hledger >=1.10.99 && <1.11
+- hledger-lib >=1.10.99 && <1.11
 - ansi-terminal >=0.6.2.3
 - async
 - base >=4.8 && <4.12
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 819abf18972b92028b9ccb3e8b1c5404368f8ca74e855c6fa226884dd01995a8
+-- hash: af29726f9b5fdc04bc36fccace21ff78efeab8ffbd021694aba928de0c886c81

 name:           hledger-web
-version:        1.10
+version:        1.10.99
 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"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      HUnit
    , base >=4.8 && <4.12
@ -165,8 +165,8 @@ library
    , directory
    , filepath
    , hjsmin
-    , hledger >=1.10 && <1.11
-    , hledger-lib >=1.10 && <1.11
+    , hledger >=1.10.99 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , http-client
    , http-conduit
    , json
@ -198,7 +198,7 @@ executable hledger-web
  hs-source-dirs:
      app
  ghc-options: -Wall -fwarn-tabs
-  cpp-options: -DVERSION="1.10"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      base
    , hledger-web
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@ -1,5 +1,5 @@
 name: hledger-web
-version: '1.10'
+version: '1.10.99'
 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"
+  cpp-options: -DVERSION="1.10.99"
  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 && <1.11
-  - hledger >=1.10 && <1.11
+  - hledger-lib >=1.10.99 && <1.11
+  - hledger >=1.10.99 && <1.11
  - base >=4.8 && <4.12
  - blaze-html
  - blaze-markup
@ -137,7 +137,7 @@ executables:
  hledger-web:
    source-dirs: app
    main: main.hs
-    cpp-options: -DVERSION="1.10"
+    cpp-options: -DVERSION="1.10.99"
    dependencies:
    - base
    - hledger-web
@ -152,7 +152,7 @@ executables:
 #   test:
 #     source-dirs: tests
 #     main: main.hs
-#     cpp-options: -DVERSION="1.10"
+#     cpp-options: -DVERSION="1.10.99"
 #     dependencies:
 #     - base
 #     - hledger-web
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 9d4dec437459d541e707fa97a836aa8b4878e685d84738bcb462c370387ad83a
+-- hash: 1f54910cba53b70497fcd12548e9fb9c5816c4f943ad5ee6214813b622c73775

 name:           hledger
-version:        1.10
+version:        1.10.99
 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
@ -109,7 +109,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"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      Decimal
    , Diff
@ -128,7 +128,7 @@ library
    , hashable >=1.2.4
    , haskeline >=0.6
    , here
-    , hledger-lib >=1.10 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , lucid
    , megaparsec >=6.4.1
    , mtl
@ -162,7 +162,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"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      Decimal
    , HUnit
@ -180,7 +180,7 @@ executable hledger
    , haskeline >=0.6
    , here
    , hledger
-    , hledger-lib >=1.10 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , megaparsec >=6.4.1
    , mtl
    , mtl-compat
@ -216,7 +216,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"
+  cpp-options: -DVERSION="1.10.99"
  build-depends:
      Decimal
    , HUnit
@ -234,7 +234,7 @@ test-suite test
    , haskeline >=0.6
    , here
    , hledger
-    , hledger-lib >=1.10 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , megaparsec >=6.4.1
    , mtl
    , mtl-compat
@ -288,7 +288,7 @@ benchmark bench
    , haskeline >=0.6
    , here
    , hledger
-    , hledger-lib >=1.10 && <1.11
+    , hledger-lib >=1.10.99 && <1.11
    , html
    , megaparsec >=6.4.1
    , mtl
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@ -1,5 +1,5 @@
 name: hledger
-version: '1.10'
+version: '1.10.99'
 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 && <1.11
+- hledger-lib >=1.10.99 && <1.11
 - 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"
+  cpp-options: -DVERSION="1.10.99"
  exposed-modules:
  - Hledger.Cli
  - Hledger.Cli.Main
@ -161,7 +161,7 @@ executables:
  hledger:
    source-dirs: app
    main: hledger-cli.hs
-    cpp-options: -DVERSION="1.10"
+    cpp-options: -DVERSION="1.10.99"
    when:
    - condition: flag(threaded)
      ghc-options: -threaded
@ -172,7 +172,7 @@ tests:
  test:
    source-dirs: test
    main: test.hs
-    cpp-options: -DVERSION="1.10"
+    cpp-options: -DVERSION="1.10.99"
    dependencies:
    - hledger
    - test-framework
 @ -1 +1 @@
 .10
 .10.99