Support aeson-1 and i-o-containers-0.2

Author: phadej

servant-swagger.cabal

@@ -44,11 +44,11 @@ library
     Servant.Swagger.Internal.TypeLevel.Every
     Servant.Swagger.Internal.TypeLevel.TMap
   hs-source-dirs:      src
-  build-depends:       aeson                     >=0.11.2.0 && <0.12
+  build-depends:       aeson                     >=0.11.2.0 && <1.1
                      , base                      >=4.7.0.0  && <4.10
                      , bytestring                >=0.10.4.0 && <0.11
                      , http-media                >=0.6.3    && <0.7
-                     , insert-ordered-containers >=0.1.0.0  && <0.2
+                     , insert-ordered-containers >=0.1.0.0  && <0.3
                      , lens                      >=4.7.0.1  && <4.15
                      , servant                   >=0.5      && <0.9
                      , swagger2                  >=2.1      && <2.2

src/Servant/Swagger/Internal.hs

@@ -225,6 +225,12 @@ instance (KnownSymbol sym, ToParamSchema a, HasSwagger sub) => HasSwagger (Captu
             & in_ .~ ParamPath
             & paramSchema .~ toParamSchema (Proxy :: Proxy a))
 
+#if MIN_VERSION_servant(0,8,1)
+-- | Swagger Spec doesn't have a notion of CaptureAll, this instance is the best effort.
+instance (KnownSymbol sym, ToParamSchema a, HasSwagger sub) => HasSwagger (CaptureAll sym a :> sub) where
+  toSwagger _ = toSwagger (Proxy :: Proxy (Capture sym a :> sub))
+#endif
+
 instance (KnownSymbol sym, ToParamSchema a, HasSwagger sub) => HasSwagger (QueryParam sym a :> sub) where
   toSwagger _ = toSwagger (Proxy :: Proxy sub)
     & addParam param

stack.yaml

@@ -1,6 +1,7 @@
-resolver: nightly-2016-07-19
+resolver: nightly-2016-09-10
 packages:
 - '.'
 - example/
 extra-deps:
-- swagger2-2.1.1
+- servant-0.8.1
+- servant-server-0.8.1