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

servant-0.15 support

Author: phadej

.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]}}
@@ -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}
@@ -119,20 +113,8 @@ script:
   # Constraint sets
   - rm -rf cabal.project.local
 
-  # 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-multipart.cabal"]

CHANGELOG.md

@@ -1,3 +1,9 @@
+0.11.3
+------
+
+- Add `HasForeign (MultipartForm t a :> api)` instance.
+  [#20](https://github.com/haskell-servant/servant-multipart/pull/20)
+
 0.11.2
 ------
 

cabal.make-travis-yml

@@ -1,19 +1,3 @@
-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.*

servant-multipart.cabal

@@ -1,6 +1,5 @@
 name:                servant-multipart
-version:             0.11.2
-x-revision:          1
+version:             0.11.3
 synopsis:            multipart/form-data (e.g file upload) support for servant
 description:
   This package adds support for file upload to the servant ecosystem. It draws
@@ -18,32 +17,35 @@ build-type:          Simple
 cabal-version:       >=1.10
 extra-source-files:  CHANGELOG.md
 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
+   || ==8.6.2
 
 library
+  default-language:    Haskell2010
   hs-source-dirs:      src
   exposed-modules:     Servant.Multipart
+
+  -- ghc boot libs
   build-depends:
-                base >= 4.7 && < 5,
-                bytestring >= 0.10 && <0.11,
-                directory,
-                http-media >= 0.6 && <0.8,
-                lens >= 4.0 && < 4.18,
-                resourcet >=1.1 && <1.3,
-                servant >=0.10 && <0.15,
-                servant-docs >=0.10 && <0.15,
-                servant-server >=0.10 && <0.15,
-                text >=1.2 && <1.3,
-                transformers >=0.3 && <0.6,
-                wai >= 3.2 && <3.3,
-                wai-extra >=3.0 && <3.1,
-                servant-foreign
-  default-language:    Haskell2010
+    base            >= 4.9       && < 5,
+    bytestring      >= 0.10.8.1  && < 0.11,
+    directory       >= 1.3       && < 1.4,
+    text            >= 1.2.3.0   && < 1.3,
+    transformers    >= 0.5.2.0   && < 0.6
+
+  -- other dependencies
+  build-depends:
+    http-media      >= 0.7.1.3  && <0.8,
+    lens            >= 4.17     && < 4.18,
+    resourcet       >= 1.2.2    && <1.3,
+    servant         >= 0.15     && <0.16,
+    servant-docs    >= 0.10     && <0.15,
+    servant-foreign >= 0.15     && <0.16,
+    servant-server  >= 0.15     && <0.16,
+    wai             >= 3.2.1.2  && <3.3,
+    wai-extra       >= 3.0.24.3 && <3.1
 
 executable upload
   hs-source-dirs:      exe