summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimonMichael <>2017-08-25 15:50:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-08-25 15:50:00 (GMT)
commit71ee22615c1649e7931a5ac4ce5f6252e59dd364 (patch)
tree2c5e794443e571a43a8ec150bde5d64fe9d573ee
parentd30d8e4042136509a6ff8bb66243a8d3594778a5 (diff)
version 1.3.11.3.1
-rw-r--r--CHANGES7
-rw-r--r--doc/hledger-api.12
-rw-r--r--doc/hledger-api.1.info8
-rw-r--r--doc/hledger-api.1.txt2
-rw-r--r--hledger-api.cabal12
-rw-r--r--hledger-api.hs6
6 files changed, 22 insertions, 15 deletions
diff --git a/CHANGES b/CHANGES
index 273c044..8fdb310 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,13 @@ User-visible changes in hledger-api.
See also the hledger and the project change logs.
+# 1.3.1 (2017/8/25)
+
+* require servant-server 0.10+ to fix compilation warning
+
+* restore upper bounds on hledger packages
+
+
# 1.3 (2017/6/30)
Depends on hledger[-lib] 1.3, see related changelogs.
diff --git a/doc/hledger-api.1 b/doc/hledger-api.1
index d9f8730..8375973 100644
--- a/doc/hledger-api.1
+++ b/doc/hledger-api.1
@@ -1,5 +1,5 @@
-.TH "hledger\-api" "1" "June 2017" "hledger\-api 1.3" "hledger User Manuals"
+.TH "hledger\-api" "1" "August 2017" "hledger\-api 1.3.1" "hledger User Manuals"
diff --git a/doc/hledger-api.1.info b/doc/hledger-api.1.info
index 3e83c44..15e504b 100644
--- a/doc/hledger-api.1.info
+++ b/doc/hledger-api.1.info
@@ -3,8 +3,8 @@ This is hledger-api.1.info, produced by makeinfo version 6.0 from stdin.

File: hledger-api.1.info, Node: Top, Next: OPTIONS, Up: (dir)
-hledger-api(1) hledger-api 1.3
-******************************
+hledger-api(1) hledger-api 1.3.1
+********************************
hledger-api is a simple web API server, intended to support client-side
web apps operating on hledger data. It comes with a series of simple
@@ -73,7 +73,7 @@ options as shown above.

Tag Table:
Node: Top74
-Node: OPTIONS1220
-Ref: #options1307
+Node: OPTIONS1224
+Ref: #options1311

End Tag Table
diff --git a/doc/hledger-api.1.txt b/doc/hledger-api.1.txt
index edd500a..dd3c9fc 100644
--- a/doc/hledger-api.1.txt
+++ b/doc/hledger-api.1.txt
@@ -107,4 +107,4 @@ SEE ALSO
-hledger-api 1.3 June 2017 hledger-api(1)
+hledger-api 1.3.1 August 2017 hledger-api(1)
diff --git a/hledger-api.cabal b/hledger-api.cabal
index 67535d0..efeb4fb 100644
--- a/hledger-api.cabal
+++ b/hledger-api.cabal
@@ -1,9 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.17.0.
+-- This file has been generated from package.yaml by hpack version 0.17.1.
--
-- see: https://github.com/sol/hpack
name: hledger-api
-version: 1.3
+version: 1.3.1
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.
@@ -44,10 +44,10 @@ source-repository head
executable hledger-api
main-is: hledger-api.hs
ghc-options: -threaded
- cpp-options: -DVERSION="1.3"
+ cpp-options: -DVERSION="1.3.1"
build-depends:
- hledger-lib >= 1.3
- , hledger >= 1.3
+ hledger-lib >= 1.3.1 && < 1.4
+ , hledger >= 1.3.1 && < 1.4
, base >=4.8 && <5
, aeson
, bytestring
@@ -58,7 +58,7 @@ executable hledger-api
, microlens >=0.4 && <0.5
, microlens-platform >=0.2.3.1 && <0.4
, safe
- , servant-server
+ , servant-server >= 0.10
, servant-swagger
, swagger2
, text
diff --git a/hledger-api.hs b/hledger-api.hs
index 3e94096..0897c4b 100644
--- a/hledger-api.hs
+++ b/hledger-api.hs
@@ -35,12 +35,12 @@ import Text.Printf
import Hledger.Query
import Hledger.Cli hiding (Reader, version)
-hledgerApiVersion="1.3"
+hledgerApiVersion="1.3.1"
-- https://github.com/docopt/docopt.hs#readme
doc :: Docopt
doc = [docopt|
-hledger-api 1.3
+hledger-api 1.3.1
Serves hledger data and reports as a JSON web API.
@@ -147,7 +147,7 @@ hledgerApiApp staticdir j = Servant.serve api server
:<|> accounttransactionsH
)
--
- :<|> serveDirectory staticdir
+ :<|> serveDirectoryFileServer staticdir
where
accountnamesH = return $ journalAccountNames j
transactionsH = return $ jtxns j