diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 40c07aedf..c6bbdf508 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -60,7 +60,7 @@ executable hledger-api , safe , servant-server >= 0.10 , servant-swagger - , swagger2 >= 2.0 && < 2.1.5 + , swagger2 >= 2.0 && < 2.2 , text , transformers , wai diff --git a/hledger-api/hledger-api.hs b/hledger-api/hledger-api.hs index 81561f065..a1cb21e7d 100644 --- a/hledger-api/hledger-api.hs +++ b/hledger-api/hledger-api.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} @@ -212,6 +213,9 @@ instance ToSchema Side instance ToSchema DigitGroupStyle instance ToSchema MixedAmount instance ToSchema Price +#if MIN_VERSION_swagger2(2,1,5) + where declareNamedSchema = genericDeclareNamedSchemaUnrestricted defaultSchemaOptions +#endif instance ToSchema MarketPrice instance ToSchema PostingType instance ToSchema Posting diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml index 8c397f0e3..a8b206f40 100644 --- a/hledger-api/package.yaml +++ b/hledger-api/package.yaml @@ -46,7 +46,7 @@ dependencies: - safe - servant-server >= 0.10 - servant-swagger -- swagger2 >= 2.0 && < 2.1.5 +- swagger2 >= 2.0 && < 2.2 - text - transformers - wai