Merge pull request #69 from phadej/ghc-8.2

Support GHC-8.2

Author: phadej

.gitignore

@@ -2,6 +2,8 @@
 .DS_Store
 *.nix
 dist/
+dist-newstyle/
+.ghc.environment.*
 /foo.json
 servant-client-0.4.4/
 cabal-dev

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   make_travis_yml_2.hs 'servant-swagger.cabal'
+#   make_travis_yml_2.hs '--branch' 'master' 'servant-swagger.cabal'
 #
 # For more information, see https://github.com/hvr/multi-ghc-travis
 #
@@ -10,10 +10,15 @@ sudo: false
 git:
   submodules: false  # whether to recursively clone submodules
 
+branches:
+  only:
+    - master
+
 cache:
   directories:
     - $HOME/.cabal/packages
     - $HOME/.cabal/store
+    - $HOME/.local/bin
 
 before_cache:
   - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
@@ -27,19 +32,22 @@ before_cache:
 matrix:
   include:
     - compiler: "ghc-7.8.4"
-      # env: TEST=--disable-tests BENCH=--disable-benchmarks
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
     - compiler: "ghc-7.10.3"
-      # env: TEST=--disable-tests BENCH=--disable-benchmarks
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
-      # env: TEST=--disable-tests BENCH=--disable-benchmarks
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.2.1"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
 
 before_install:
  - HC=${CC}
  - unset CC
- - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
+ - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/.local/bin:$PATH
  - PKGNAME='servant-swagger'
 
 install:
@@ -49,23 +57,18 @@ install:
  - TEST=${TEST---enable-tests}
  - travis_retry cabal update -v
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- # Install hspec-discover manually, before hackage accepts build-tool-depends
- - mkdir -p $HOME/.local/bin
- - export PATH=$HOME/.local/bin/:$PATH
- - cabal get hspec-discover
- - "cd hspec-discover-*; cabal new-build hspec-discover:exe:hspec-discover; cp $(find dist-newstyle -type f -name hspec-discover) $HOME/.local/bin; cd .."
-
+ - sh install-hspec-discover.sh # TEMP: we should use build-tools-depends
  - rm -fv cabal.project.local
  - "echo 'packages: .' > cabal.project"
  - rm -f cabal.project.freeze
- - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
 
 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
  - if [ -f configure.ac ]; then autoreconf -i; fi
- - rm -rf dist/ .ghc.environment.*
+ - rm -rf .ghc.environment.* dist/
  - cabal sdist # test that a source-distribution can be generated
  - cd dist/
  - SRCTAR=(${PKGNAME}-*.tar.gz)
@@ -77,27 +80,15 @@ script:
  - "echo 'packages: .' > cabal.project"
  # this builds all libraries and executables (without tests/benchmarks)
  - rm -f cabal.project.freeze
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
-
- # Build with various constraints
- - if [ $HC = "ghc-8.0.2" ]; then UNLESSGHC802=true; fi
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.5.*"
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.6.*"
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.7.*"
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.8.*"
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.9.*"
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks "--constraint=servant==0.10.*"
-
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
  # this builds all libraries and executables (including tests/benchmarks)
  # - rm -rf ./dist-newstyle
- - cabal new-build -w ${HC} ${TEST} ${BENCH}
 
- # there's no 'cabal new-test' yet, so let's emulate for now
- - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
- - if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
- - shopt -s globstar;
-   RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
-   if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
-   else echo "= $T FAILED ="; RC=false; fi; done; $RC
+ # build & run tests, build benchmarks
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
+
+ # haddock
+ - cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all
 
 # EOF

Setup.hs

@@ -0,0 +1,33 @@
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -Wall #-}
+module Main (main) where
+
+#ifndef MIN_VERSION_cabal_doctest
+#define MIN_VERSION_cabal_doctest(x,y,z) 0
+#endif
+
+#if MIN_VERSION_cabal_doctest(1,0,0)
+
+import Distribution.Extra.Doctest ( defaultMainWithDoctests )
+main :: IO ()
+main = defaultMainWithDoctests "doctests"
+
+#else
+
+#ifdef MIN_VERSION_Cabal
+-- If the macro is defined, we have new cabal-install,
+-- but for some reason we don't have cabal-doctest in package-db
+--
+-- Probably we are running cabal sdist, when otherwise using new-build
+-- workflow
+#warning You are configuring this package without cabal-doctest installed. \
+         The doctests test-suite will not work as a result. \
+         To fix this, install cabal-doctest before configuring.
+#endif
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
+
+#endif

Setup.lhs

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -ex
+
+if [ ! -e $HOME/.local/bin/hspec-discover ]; then
+  # Fetch the source
+  cabal get hspec-discover-2.4.4
+  cd hspec-discover-2.4.4
+
+  # Set-up project
+  echo 'packages: .' > cabal.project
+
+  # build exe
+  cabal new-build hspec-discover:exe:hspec-discover
+
+  # copy executable to $HOME/.local/bin
+  mkdir -p $HOME/.local/bin
+  cp $(find dist-newstyle -name hspec-discover -type f) $HOME/.local/bin
+fi

install-hspec-discover.sh

@@ -1,5 +1,6 @@
 name:                servant-swagger
 version:             1.1.3
+x-revision:          1
 synopsis:            Generate Swagger specification for your servant API.
 description:         Please see README.md
 homepage:            https://github.com/haskell-servant/servant-swagger
@@ -15,7 +16,8 @@ cabal-version:       >=1.10
 tested-with:
   GHC==7.8.4,
   GHC==7.10.3,
-  GHC==8.0.2
+  GHC==8.0.2,
+  GHC==8.2.1
 extra-source-files:
     README.md
   , CHANGELOG.md
@@ -35,9 +37,9 @@ source-repository head
 
 custom-setup
   setup-depends:
-    base >=4.7 && <4.10,
-    Cabal >= 1.18 && <2.0,
-    cabal-doctest >=1 && <1.1
+    base >=4.7 && <4.11,
+    Cabal >= 1.18 && <2.1,
+    cabal-doctest >=1.0.2 && <1.1
 
 library
   ghc-options:         -Wall
@@ -55,7 +57,7 @@ library
     Servant.Swagger.Internal.TypeLevel.TMap
   hs-source-dirs:      src
   build-depends:       aeson                     >=0.11.2.0 && <1.3
-                     , base                      >=4.7.0.0  && <4.10
+                     , base                      >=4.7.0.0  && <4.11
                      , bytestring                >=0.10.4.0 && <0.11
                      , http-media                >=0.6.3    && <0.8
                      , insert-ordered-containers >=0.1.0.0  && <0.3