Merge pull request #92 from haskell-servant/ghc-8.6

Support GHC-8.6

Author: phadej

.travis.yml

@@ -2,7 +2,7 @@
 #
 #   runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' 'servant-swagger.cabal'
 #
-# For more information, see https://github.com/hvr/multi-ghc-travis
+# For more information, see https://github.com/haskell-CI/haskell-ci
 #
 language: c
 sudo: false
@@ -32,21 +32,24 @@ before_cache:
 
 matrix:
   include:
-    - compiler: "ghc-8.4.3"
+    - compiler: "ghc-8.6.1"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], 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]}}
     - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
+      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.2,ghc-7.10.3], sources: [hvr-ghc]}}
+      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.2,ghc-7.8.4], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
 
 before_install:
   - HC=${CC}
@@ -89,8 +92,8 @@ install:
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
   # test that source-distributions can be generated
-  - (cd "." && cabal sdist)
-  - mv "."/dist/servant-swagger-*.tar.gz ${DISTDIR}/
+  - cabal new-sdist all
+  - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
   - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
   - "printf 'packages: servant-swagger-*/*.cabal\\n' > cabal.project"
@@ -109,7 +112,6 @@ script:
   - (cd servant-swagger-* && cabal check)
 
   # haddock
-  - rm -rf ./dist-newstyle
   - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
 
   # Build without installed constraints for packages in global-db

CHANGELOG.md

@@ -4,6 +4,9 @@ next
 * Fixes:
   * `validateEveryToJSON` now prints validation errors
 
+* Notes:
+  * GHC-8.6 compatible release
+
 1.1.5
 -----
 

servant-swagger.cabal

@@ -1,6 +1,5 @@
 name:                servant-swagger
-version:             1.1.5
-x-revision:          5
+version:             1.1.6
 synopsis:            Generate Swagger specification for your servant API.
 description:
   Swagger is a project used to describe and document RESTful APIs.
@@ -28,11 +27,12 @@ category:            Web, Servant, Swagger
 build-type:          Custom
 cabal-version:       1.18
 tested-with:
-  GHC==7.8.4,
-  GHC==7.10.3,
-  GHC==8.0.2,
-  GHC==8.2.2,
-  GHC==8.4.3
+  GHC ==7.8.4
+   || ==7.10.3
+   || ==8.0.2
+   || ==8.2.2
+   || ==8.4.4
+   || ==8.6.1
 
 extra-source-files:
     README.md
@@ -53,8 +53,8 @@ source-repository head
 
 custom-setup
   setup-depends:
-    base >=4.7 && <4.12,
-    Cabal >= 1.18 && <2.3,
+    base >=4.7 && <4.13,
+    Cabal >= 1.18 && <2.5,
     cabal-doctest >=1.0.2 && <1.1
 
 library
@@ -74,7 +74,7 @@ library
   hs-source-dirs:      src
   build-depends:       aeson                     >=0.11.2.0 && <1.5
                      , aeson-pretty              >=0.4      && <0.9
-                     , base                      >=4.7.0.0  && <4.12
+                     , base                      >=4.7.0.0  && <4.13
                      , bytestring                >=0.10.4.0 && <0.11
                      , http-media                >=0.6.3    && <0.8
                      , insert-ordered-containers >=0.1.0.0  && <0.3
@@ -110,16 +110,19 @@ test-suite spec
   main-is:          Spec.hs
   build-tool-depends: hspec-discover:hspec-discover
   build-depends:    base
+                  , base-compat >= 0.10.4 && <0.11
                   , aeson
-                  , aeson-qq >=0.8.1
                   , hspec
                   , QuickCheck
                   , lens
                   , servant
                   , servant-swagger
                   , swagger2
                   , text
+                  , template-haskell
+                  , utf8-string >=1.0.1.1 && <1.1
                   , time
   other-modules:
     Servant.SwaggerSpec
+    Data.Aeson.QQ.Simple
   default-language: Haskell2010

src/Servant/Swagger/Internal.hs

@@ -14,6 +14,9 @@
 {-# LANGUAGE OverlappingInstances #-}
 #define OVERLAPPABLE_
 #endif
+#if __GLASGOW_HASKELL__ >= 806
+{-# LANGUAGE UndecidableInstances #-}
+#endif
 module Servant.Swagger.Internal where
 
 import           Control.Lens

test/Data/Aeson/QQ/Simple.hs

@@ -0,0 +1,25 @@
+-- | Like "Data.Aeson.QQ" but without interpolation.
+module Data.Aeson.QQ.Simple (aesonQQ) where
+
+import           Data.Aeson (eitherDecode, Value)
+import           Data.ByteString.Lazy.UTF8  as UTF8
+import qualified Data.Text                  as T
+import           Language.Haskell.TH
+import           Language.Haskell.TH.Quote
+import           Language.Haskell.TH.Syntax (Lift (..))
+import           Prelude                    ()
+import           Prelude.Compat
+
+aesonQQ :: QuasiQuoter
+aesonQQ = QuasiQuoter
+    { quoteExp  = aesonExp
+    , quotePat  = const $ error "No quotePat defined for jsonQQ"
+    , quoteType = const $ error "No quoteType defined for jsonQQ"
+    , quoteDec  = const $ error "No quoteDec defined for jsonQQ"
+    }
+
+aesonExp :: String -> ExpQ
+aesonExp txt =
+  case eitherDecode $ UTF8.fromString txt of
+    Left err  -> error $ "Error in aesonExp: " ++ show err
+    Right val -> lift (val :: Value)

test/Servant/SwaggerSpec.hs

@@ -12,7 +12,7 @@ module Servant.SwaggerSpec where
 
 import           Control.Lens
 import           Data.Aeson       (ToJSON(toJSON), Value, genericToJSON)
-import           Data.Aeson.QQ
+import           Data.Aeson.QQ.Simple
 import qualified Data.Aeson.Types as JSON
 import           Data.Char        (toLower)
 import           Data.Int         (Int64)