Merge pull request #10 from haskell-servant/servant-0.15

Support servant-0.15
haskell-servant · Nov 13, 2018 · 463b95c · 463b95c
2 parents fc17965 + 0657130
commit 463b95c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,9 +32,9 @@ before_cache:
 
 matrix:
   include:
-    - compiler: "ghc-8.6.1"
+    - compiler: "ghc-8.6.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.4"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
@@ -142,7 +142,10 @@ script:
   - 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
+  - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80800 ]; 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-blaze.cabal"]

diff --git a/cabal.make-travis-yml b/cabal.make-travis-yml
@@ -27,5 +27,9 @@ constraint-set servant-0.13
   constraints: servant ==0.13.*
 
 constraint-set servant-0.14
-  ghc: >= 7.8 && <8.6
-  constraints: servant ==0.14
+  ghc: >= 7.8 && <8.8
+  constraints: servant ==0.14.*
+
+constraint-set servant-0.15
+  ghc: >= 8.0 && <8.8
+  constraints: servant ==0.15.*
diff --git a/servant-blaze.cabal b/servant-blaze.cabal
@@ -1,28 +1,30 @@
+cabal-version:       >=1.10
 name:                servant-blaze
 version:             0.8
 x-revision:          2
+
 synopsis:            Blaze-html support for servant
+category:            Servant, Web
 description:
   Servant support for blaze-html
   .
   'HTML' content type which will use `ToMarkup` class.
+
 homepage:            http://haskell-servant.readthedocs.org/
+bug-reports:         http://github.com/haskell-servant/servant-blaze/issues
 license:             BSD3
 license-file:        LICENSE
 author:              Servant Contributors
 maintainer:          [email protected]
-copyright:           2015-2016 Servant Contributors
-category:            Web, Servant
+copyright:           2015-2018 Servant Contributors
 build-type:          Simple
-cabal-version:       >=1.10
-bug-reports:         http://github.com/haskell-servant/servant-blaze/issues
 tested-with:
   GHC ==7.8.4
    || ==7.10.3
    || ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.1
+   || ==8.6.2
 
 source-repository head
   type: git
@@ -31,7 +33,7 @@ source-repository head
 library
   exposed-modules:     Servant.HTML.Blaze
   build-depends:       base       >=4.7     && <5
-                     , servant    >=0.7     && <0.15
+                     , servant    >=0.7     && <0.16
                      , http-media >=0.6.4   && <0.8
                      , blaze-html >=0.9.0.1 && <0.10
   hs-source-dirs:      src
@@ -48,7 +50,7 @@ test-suite example
       base
     , blaze-html
     , servant-blaze
-    , servant-server >=0.4.4.5  && <0.15
+    , servant-server >=0.4.4.5  && <0.16
     , wai            >=3.0.3.0  && <3.3
     , warp           >=3.0.13.1 && <3.3
   default-language: Haskell2010