Merge branch 'master' into master

GetShopTV · Mar 22, 2018 · 37b0500 · 37b0500
2 parents eb9255d + af7392f
commit 37b0500
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
-next
-----
+2.2.1
+-----
 
 * Add `Semigroup` instances
 * GHC-8.4 compatibility
+* `Schema (NonEmpty a) instance (see [#141](https://github.com/GetShopTV/swagger2/pull/141))
+* Fix optional property for unary records (see [#142](https://github.com/GetShopTV/swagger2/issues/142))
+* Add `fromAesonOptions` helper (see [#146](https://github.com/GetShopTV/swagger2/issues/139))
+* Fix non-termination when using `datatypeNameModifier` with recursive data types (see [#132](https://github.com/GetShopTV/swagger2/issues/132))
 
 2.2
 ---

diff --git a/src/Data/Swagger/Internal/Schema.hs b/src/Data/Swagger/Internal/Schema.hs
@@ -562,6 +562,7 @@ instance ToSchema a => ToSchema (Set a) where
 
 instance ToSchema a => ToSchema (HashSet a) where declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy (Set a))
 
+-- | @since 2.2.1
 instance ToSchema a => ToSchema (NonEmpty a) where
   declareNamedSchema _ = do
     schema <- declareSchema (Proxy :: Proxy [a])

diff --git a/src/Data/Swagger/SchemaOptions.hs b/src/Data/Swagger/SchemaOptions.hs
@@ -60,6 +60,9 @@ defaultSchemaOptions = SchemaOptions
 -- * 'Aeson.tagSingleConstructors'
 --
 -- The rest is defined as in 'defaultSchemaOptions'.
+--
+-- @since 2.2.1
+--
 fromAesonOptions :: Aeson.Options -> SchemaOptions
 fromAesonOptions opts = defaultSchemaOptions
   { fieldLabelModifier     = Aeson.fieldLabelModifier     opts

diff --git a/swagger2.cabal b/swagger2.cabal
@@ -1,5 +1,5 @@
 name:                swagger2
-version:             2.2
+version:             2.2.1
 synopsis:            Swagger 2.0 data model
 description:
   This library is inteded to be used for decoding and encoding Swagger 2.0 API