Merge pull request #86 from haskell-servant/allow-swagger2-2.3

phadej · web-flow · commit 4273f9cbeba1 · 2018-08-06T15:01:23.000+03:00
Allow swagger2 2.3
diff --git a/example/swagger.json b/example/swagger.json
@@ -56,7 +56,7 @@
                     }
                 },
                 "produces": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ],
                 "parameters": [
                     {
@@ -71,7 +71,7 @@
             },
             "put": {
                 "consumes": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ],
                 "responses": {
                     "404": {
@@ -88,7 +88,7 @@
                     }
                 },
                 "produces": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ],
                 "parameters": [
                     {
@@ -113,7 +113,7 @@
         "/todo": {
             "post": {
                 "consumes": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ],
                 "responses": {
                     "400": {
@@ -127,7 +127,7 @@
                     }
                 },
                 "produces": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ],
                 "parameters": [
                     {
@@ -153,7 +153,7 @@
                     }
                 },
                 "produces": [
-                    "application/json"
+                    "application/json;charset=utf-8"
                 ]
             }
         }
diff --git a/servant-swagger.cabal b/servant-swagger.cabal
@@ -1,6 +1,6 @@
 name:                servant-swagger
 version:             1.1.5
-x-revision:          4
+x-revision:          5
 synopsis:            Generate Swagger specification for your servant API.
 description:
   Swagger is a project used to describe and document RESTful APIs.
@@ -81,7 +81,7 @@ library
                      , lens                      >=4.7.0.1  && <4.18
                      , servant                   >=0.13     && <0.15
                      , singleton-bool            >=0.1.3    && <0.2
-                     , swagger2                  >=2.1      && <2.3
+                     , swagger2                  >=2.1      && <2.4
                      , text                      >=1.2.0.6  && <1.3
                      , unordered-containers      >=0.2.5.1  && <0.3
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`}`
`57`	`57`	`},`
`58`	`58`	`"produces": [`
`59`		`- "application/json"`
	`59`	`+ "application/json;charset=utf-8"`
`60`	`60`	`],`
`61`	`61`	`"parameters": [`
`62`	`62`	`{`
`@@ -71,7 +71,7 @@`
`71`	`71`	`},`
`72`	`72`	`"put": {`
`73`	`73`	`"consumes": [`
`74`		`- "application/json"`
	`74`	`+ "application/json;charset=utf-8"`
`75`	`75`	`],`
`76`	`76`	`"responses": {`
`77`	`77`	`"404": {`
`@@ -88,7 +88,7 @@`
`88`	`88`	`}`
`89`	`89`	`},`
`90`	`90`	`"produces": [`
`91`		`- "application/json"`
	`91`	`+ "application/json;charset=utf-8"`
`92`	`92`	`],`
`93`	`93`	`"parameters": [`
`94`	`94`	`{`
`@@ -113,7 +113,7 @@`
`113`	`113`	`"/todo": {`
`114`	`114`	`"post": {`
`115`	`115`	`"consumes": [`
`116`		`- "application/json"`
	`116`	`+ "application/json;charset=utf-8"`
`117`	`117`	`],`
`118`	`118`	`"responses": {`
`119`	`119`	`"400": {`
`@@ -127,7 +127,7 @@`
`127`	`127`	`}`
`128`	`128`	`},`
`129`	`129`	`"produces": [`
`130`		`- "application/json"`
	`130`	`+ "application/json;charset=utf-8"`
`131`	`131`	`],`
`132`	`132`	`"parameters": [`
`133`	`133`	`{`
`@@ -153,7 +153,7 @@`
`153`	`153`	`}`
`154`	`154`	`},`
`155`	`155`	`"produces": [`
`156`		`- "application/json"`
	`156`	`+ "application/json;charset=utf-8"`
`157`	`157`	`]`
`158`	`158`	`}`
`159`	`159`	`}`