Merge pull request #1 from haskell-servant/master

bring changes

Author: asilvestre

.travis.yml

@@ -44,6 +44,9 @@ matrix:
     - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.4.1"
+      env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
 
 before_install:
   - HC=${CC}
@@ -75,7 +78,7 @@ install:
   - rm -f cabal.project.freeze
   - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
   - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
-  - rm -rf "."/.ghc.environment.* "."/dist
+  - rm -rf .ghc.environment.* "."/dist
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
 
 # Here starts the actual work to be performed for the package under test;

README.md

@@ -9,7 +9,7 @@ vanilla (framework-free) javascript code.
 
 ## Example
 
-Read more about the following example [here](https://github.com/haskell-servant/servant/tree/master/servant-js/examples#examples).
+Read more about the following example [here](https://github.com/haskell-servant/servant-js/tree/master/examples).
 
 ``` haskell
 {-# LANGUAGE DataKinds #-}

servant-js.cabal

@@ -1,5 +1,6 @@
 name:                servant-js
 version:             0.9.3.2
+x-revision:          1
 synopsis:            Automatically derive javascript functions to query servant webservices.
 description:
   Automatically derive javascript functions to query servant webservices.
@@ -21,7 +22,7 @@ build-type:          Simple
 cabal-version:       >=1.10
 homepage:            http://haskell-servant.readthedocs.org/
 bug-reports:         http://github.com/haskell-servant/servant-js/issues
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
 extra-source-files:
   include/*.h
   CHANGELOG.md
@@ -42,7 +43,7 @@ library
                        Servant.JS.Internal
                        Servant.JS.JQuery
                        Servant.JS.Vanilla
-  build-depends:       base            >= 4.7 && <4.11
+  build-depends:       base            >= 4.7 && <4.12
                      , base-compat     >= 0.9
                      , charset         >= 0.3
                      , lens            >= 4
@@ -66,7 +67,7 @@ executable counter
     buildable: False
 
   build-depends:    base
-                  , aeson            >= 0.7  && < 1.3
+                  , aeson            >= 0.7  && < 1.4
                   , filepath         >= 1
                   , lens             >= 4
                   , servant
@@ -85,10 +86,10 @@ test-suite spec
   other-modules:
       Servant.JSSpec
       Servant.JSSpec.CustomHeaders
-  build-tool-depends: hspec-discover:hspec-discover >=2.3.0 && <2.5
+  build-tool-depends: hspec-discover:hspec-discover >=2.3.0 && <2.6
   build-depends:     base
                    , base-compat
-                   , hspec >= 2.3.0 && <2.5
+                   , hspec >= 2.3.0 && <2.6
                    , hspec-expectations
                    , language-ecmascript >= 0.16
                    , lens