From 26fe22532514f591300317086cf77810db356eb7 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 13 Nov 2018 18:43:56 +0200 Subject: [PATCH] Prepare for 0.9.4 release --- .travis.yml | 25 ++----------------------- CHANGELOG.md | 5 +++++ cabal.make-travis-yml | 26 +++----------------------- servant-js.cabal | 27 ++++++++++++--------------- src/Servant/JS/Angular.hs | 4 +++- src/Servant/JS/Axios.hs | 4 +++- src/Servant/JS/Internal.hs | 5 ++++- src/Servant/JS/JQuery.hs | 4 +++- src/Servant/JS/Vanilla.hs | 4 +++- 9 files changed, 38 insertions(+), 66 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bf8a9f..a6c419d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,6 @@ matrix: - compiler: "ghc-8.0.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} - - compiler: "ghc-7.10.3" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}} - - compiler: "ghc-7.8.4" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}} before_install: - HC=${CC} @@ -120,23 +114,8 @@ script: # Constraint sets - rm -rf cabal.project.local - # Constraint set servant-0.9 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80200 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.9.*' all; else echo skipping...; fi - - # Constraint set servant-0.10 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80200 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.10.*' all; else echo skipping...; fi - - # Constraint set servant-0.11 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.11.*' all; else echo skipping...; fi - - # Constraint set servant-0.12 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.12.*' all; else echo skipping...; fi - - # Constraint set servant-0.13 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80600 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi - - # Constraint set servant-0.14 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80600 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all; else echo skipping...; fi + # Constraint set servant-0.15 + - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all; else echo skipping...; fi # REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-js.cabal"] diff --git a/CHANGELOG.md b/CHANGELOG.md index 27e1236..9baf55b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +0.9.4 +----- + +* `servant-0.15` support + 0.9.3 ------- diff --git a/cabal.make-travis-yml b/cabal.make-travis-yml index a722969..20a2e87 100644 --- a/cabal.make-travis-yml +++ b/cabal.make-travis-yml @@ -1,23 +1,3 @@ -constraint-set servant-0.9 - ghc: >= 7.8 && <8.2 - constraints: servant ==0.9.* - -constraint-set servant-0.10 - ghc: >= 7.8 && <8.2 - constraints: servant ==0.10.* - -constraint-set servant-0.11 - ghc: >= 7.8 && <8.4 - constraints: servant ==0.11.* - -constraint-set servant-0.12 - ghc: >= 7.8 && <8.4 - constraints: servant ==0.12.* - -constraint-set servant-0.13 - ghc: >= 7.8 && <8.6 - constraints: servant ==0.13.* - -constraint-set servant-0.14 - ghc: >= 7.8 && <8.6 - constraints: servant ==0.14.* +constraint-set servant-0.15 + ghc: >= 8.0 && <8.8 + constraints: servant ==0.15.* diff --git a/servant-js.cabal b/servant-js.cabal index 360202f..ea6c249 100644 --- a/servant-js.cabal +++ b/servant-js.cabal @@ -1,6 +1,5 @@ name: servant-js -version: 0.9.3.2 -x-revision: 3 +version: 0.9.4 synopsis: Automatically derive javascript functions to query servant webservices. category: Web, Servant @@ -25,9 +24,7 @@ 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 - || ==7.10.3 - || ==8.0.2 + GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 @@ -52,13 +49,13 @@ library Servant.JS.Internal Servant.JS.JQuery Servant.JS.Vanilla - build-depends: base >= 4.7 && <4.13 - , base-compat >= 0.9 - , charset >= 0.3 - , lens >= 4 - , servant-foreign >= 0.9 && <0.12 - , servant >= 0.9 && <0.15 - , text >= 1.2 && < 1.3 + build-depends: base >= 4.9 && <4.13 + , base-compat >= 0.10.5 && <0.11 + , charset >= 0.3.7.1 && <0.4 + , lens >= 4.17 && <4.18 + , servant-foreign >= 0.15 && <0.16 + , servant >= 0.15 && <0.16 + , text >= 1.2.3.0 && < 1.3 hs-source-dirs: src default-language: Haskell2010 @@ -76,7 +73,7 @@ executable counter buildable: False build-depends: base - , aeson >= 0.7 && < 1.5 + , aeson >= 1.4.1.0 && < 1.5 , filepath >= 1 , lens >= 4 , servant @@ -95,10 +92,10 @@ test-suite spec other-modules: Servant.JSSpec Servant.JSSpec.CustomHeaders - build-tool-depends: hspec-discover:hspec-discover >=2.3.0 && <2.6 + build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.7 build-depends: base , base-compat - , hspec >= 2.3.0 && <2.6 + , hspec >= 2.6.0 && <2.7 , hspec-expectations , language-ecmascript >= 0.16 , lens diff --git a/src/Servant/JS/Angular.hs b/src/Servant/JS/Angular.hs index 896490b..f3e129d 100644 --- a/src/Servant/JS/Angular.hs +++ b/src/Servant/JS/Angular.hs @@ -1,9 +1,11 @@ {-#LANGUAGE OverloadedStrings #-} module Servant.JS.Angular where +import Prelude () +import Prelude.Compat + import Control.Lens import Data.Maybe (isJust) -import Data.Monoid import qualified Data.Text as T import Data.Text (Text) import Data.Text.Encoding (decodeUtf8) diff --git a/src/Servant/JS/Axios.hs b/src/Servant/JS/Axios.hs index f0d807c..7636fef 100644 --- a/src/Servant/JS/Axios.hs +++ b/src/Servant/JS/Axios.hs @@ -1,9 +1,11 @@ {-#LANGUAGE OverloadedStrings #-} module Servant.JS.Axios where +import Prelude () +import Prelude.Compat + import Control.Lens import Data.Maybe (isJust) -import Data.Monoid import Data.Text (Text) import Data.Text.Encoding (decodeUtf8) import qualified Data.Text as T diff --git a/src/Servant/JS/Internal.hs b/src/Servant/JS/Internal.hs index 36b31c6..91e8e8c 100644 --- a/src/Servant/JS/Internal.hs +++ b/src/Servant/JS/Internal.hs @@ -45,10 +45,13 @@ module Servant.JS.Internal , Header ) where +import Prelude () +import Prelude.Compat + import Control.Lens ((^.)) import qualified Data.CharSet as Set import qualified Data.CharSet.Unicode.Category as Set -import Data.Monoid + import qualified Data.Text as T import Data.Text (Text) import Servant.Foreign diff --git a/src/Servant/JS/JQuery.hs b/src/Servant/JS/JQuery.hs index ab07c17..0b21006 100644 --- a/src/Servant/JS/JQuery.hs +++ b/src/Servant/JS/JQuery.hs @@ -1,9 +1,11 @@ {-#LANGUAGE OverloadedStrings #-} module Servant.JS.JQuery where +import Prelude () +import Prelude.Compat + import Control.Lens import Data.Maybe (isJust) -import Data.Monoid import qualified Data.Text as T import Data.Text (Text) import Data.Text.Encoding (decodeUtf8) diff --git a/src/Servant/JS/Vanilla.hs b/src/Servant/JS/Vanilla.hs index 3c77975..72e6df0 100644 --- a/src/Servant/JS/Vanilla.hs +++ b/src/Servant/JS/Vanilla.hs @@ -1,12 +1,14 @@ {-#LANGUAGE OverloadedStrings #-} module Servant.JS.Vanilla where +import Prelude () +import Prelude.Compat + import Control.Lens import Data.Maybe (isJust) import Data.Text (Text) import Data.Text.Encoding (decodeUtf8) import qualified Data.Text as T -import Data.Monoid import Servant.Foreign hiding (header) import Servant.JS.Internal