Merge pull request #12 from phadej/servant-0.12

Allow servant-0.12

Author: phadej

CHANGELOG.md

@@ -0,0 +1,10 @@
+0.11
+----
+
+- Support `servant-0.12`
+- Add support for memory backend
+
+0.10
+----
+
+- Initial release

servant-multipart.cabal

@@ -1,6 +1,5 @@
 name:                servant-multipart
-version:             0.10.0.1
-x-revision:          1
+version:             0.11
 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
@@ -12,6 +11,7 @@ copyright:           2016-2017 Alp Mestanogullari
 category:            Web, Servant
 build-type:          Simple
 cabal-version:       >=1.10
+extra-source-files:  CHANGELOG.md
 tested-with:
   GHC==7.8.4,
   GHC==7.10.3,
@@ -28,9 +28,9 @@ library
                 http-media >= 0.6 && <0.8,
                 lens >= 4.0 && < 4.16,
                 resourcet >=1.1 && <1.2,
-                servant >=0.10 && <0.12,
-                servant-docs >=0.10 && <0.12,
-                servant-server >=0.10 && <0.12,
+                servant >=0.10 && <0.13,
+                servant-docs >=0.10 && <0.13,
+                servant-server >=0.10 && <0.13,
                 text >=1.2 && <1.3,
                 transformers >=0.3 && <0.6,
                 wai >= 3.2 && <3.3,

src/Servant/Multipart.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE InstanceSigs #-}
@@ -253,6 +254,10 @@ instance ( FromMultipart tag a
   type ServerT (MultipartForm tag a :> sublayout) m =
     a -> ServerT sublayout m
 
+#if MIN_VERSION_servant_server(0,12,0)
+  hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy sublayout) pc nt . s
+#endif
+
   route Proxy config subserver =
     route psub config subserver'
     where