Merge pull request #6 from phadej/http-media-0.7

Allow http-media-0.7

Author: phadej

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   make_travis_yml_2.hs 'servant-multipart.cabal'
+#   make_travis_yml_2.hs '--branch' 'master' 'servant-multipart.cabal'
 #
 # For more information, see https://github.com/hvr/multi-ghc-travis
 #
@@ -10,6 +10,10 @@ sudo: false
 git:
   submodules: false  # whether to recursively clone submodules
 
+branches:
+  only:
+    - master
+
 cache:
   directories:
     - $HOME/.cabal/packages
@@ -35,35 +39,37 @@ matrix:
     - compiler: "ghc-8.0.2"
     # 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}
+ - HCPKG=${HC/ghc/ghc-pkg}
  - unset CC
  - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
  - PKGNAME='servant-multipart'
- - ROOTDIR=$(pwd)
 
 install:
  - cabal --version
  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - BENCH=${BENCH---enable-benchmarks}
  - TEST=${TEST---enable-tests}
+ - HADDOCK=${HADDOCK-true}
+ - INSTALLED=${INSTALLED-true}
  - travis_retry cabal update -v
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
  - rm -fv cabal.project.local
- # Fetch not-released servant
- - git clone https://github.com/haskell-servant/servant.git 
- - cd servant; git checkout 736918a694dd7247fbd3f21a9bc138f6dcc5b3dd; cd ..
- - "echo 'packages: . servant/servant/ servant/servant-server/ ' > cabal.project"
+ - "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/
+ - rm -rf .ghc.environment.* dist/
  - cabal sdist # test that a source-distribution can be generated
  - cd dist/
  - SRCTAR=(${PKGNAME}-*.tar.gz)
@@ -72,21 +78,24 @@ script:
  - cd "$SRC_BASENAME/"
 ## from here on, CWD is inside the extracted source-tarball
  - rm -fv cabal.project.local
- - "echo 'packages: . servant/servant/ servant/servant-server/ ' > cabal.project"
- - mv $ROOTDIR/servant .
+ - "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
+ - 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 with installed constraints for packages in global-db
+ - if $INSTALLED; then
+     ${HCPKG} list --global --simple-output --names-only | sed -r 's/([a-zA-Z0-9-]+*) */--constraint=\1 installed;/g' | sed 's/;$/;all/' | xargs -d ';' cabal new-build -w ${HC} --disable-tests --disable-benchmarks;
+   else echo "Not building with installed constraints"; fi
+
+ # build & run tests, build benchmarks
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+
+ # haddock
+ - rm -rf ./dist-newstyle
+ - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
 
+# REGENDATA ["--branch","master","servant-multipart.cabal"]
 # EOF

servant-multipart.cabal

@@ -1,5 +1,6 @@
 name:                servant-multipart
 version:             0.10.0.1
+x-revision:          1
 synopsis:            multipart/form-data (e.g file upload) support for servant
 description:         Please see README.md
 homepage:            https://github.com/haskell-servant/servant-multipart#readme
@@ -14,7 +15,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
 
 library
   hs-source-dirs:      src
@@ -23,7 +25,7 @@ library
                 base >= 4.7 && < 5,
                 bytestring >= 0.10 && <0.11,
                 directory,
-                http-media >= 0.6 && <0.7,
+                http-media >= 0.6 && <0.8,
                 resourcet >=1.1 && <1.2,
                 servant >=0.10 && <0.12,
                 servant-server >=0.10 && <0.12,