Skip to content

Commit b442c67

Browse files
phadejphadej
committed
Allow swagger2-2.4; Update swagger-ui to 3.22.2
1 parent 1c7286d commit b442c67

File tree

18 files changed

+386
-436
lines changed

18 files changed

+386
-436
lines changed

‎servant-swagger-ui-core/servant-swagger-ui-core.cabal

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
cabal-version: 1.12
2-
name: servant-swagger-ui-core
3-
version: 0.3.2
4-
x-revision: 4
5-
6-
synopsis: Servant swagger ui core components
7-
category: Web, Servant, Swagger
1+
cabal-version: 1.12
2+
name: servant-swagger-ui-core
3+
version: 0.3.2
4+
x-revision: 5
5+
synopsis: Servant swagger ui core components
6+
category: Web, Servant, Swagger
87
description:
9-
Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
10-
.
11-
See servant-swagger-ui, servant-swagger-ui-jensoleg or
12-
servant-swagger-ui-redoc for "concrete" implementations.
8+
Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
9+
.
10+
See servant-swagger-ui, servant-swagger-ui-jensoleg or
11+
servant-swagger-ui-redoc for "concrete" implementations.
12+
13+
homepage: https://github.com/haskell-servant/servant-swagger-ui
14+
bug-reports:
15+
https://github.com/haskell-servant/servant-swagger-ui/issues
16+
17+
author: Oleg Grenrus <[email protected]>
18+
maintainer: [email protected]
19+
license: BSD3
20+
license-file: LICENSE
21+
build-type: Simple
22+
tested-with:
23+
GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
1324

14-
homepage: https://github.com/haskell-servant/servant-swagger-ui
15-
bug-reports: https://github.com/haskell-servant/servant-swagger-ui/issues
16-
author: Oleg Grenrus <[email protected]>
17-
maintainer: [email protected]
18-
license: BSD3
19-
license-file: LICENSE
20-
build-type: Simple
21-
tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
22-
extra-source-files:
23-
Changelog.md
25+
extra-source-files: Changelog.md
2426

2527
source-repository head
26-
type: git
28+
type: git
2729
location: https://github.com/haskell-servant/servant-swagger-ui
2830

2931
library
30-
hs-source-dirs:
31-
src
32-
ghc-options: -Wall
33-
32+
hs-source-dirs: src
33+
ghc-options: -Wall
3434
build-depends:
3535
base >=4.7 && <4.13
3636
, blaze-markup >=0.7.0.2 && <0.9
@@ -39,11 +39,11 @@ library
3939
, servant >=0.14 && <0.17
4040
, servant-blaze >=0.8 && <0.10
4141
, servant-server >=0.14 && <0.17
42-
, swagger2 >=2.3.0.1 && <2.4
42+
, swagger2 >=2.3.0.1 && <2.5
4343
, text >=1.2.3.0 && <1.3
4444
, transformers >=0.3 && <0.6
4545
, transformers-compat >=0.3 && <0.7
4646
, wai-app-static >=3.0.1.1 && <3.2
47-
exposed-modules:
48-
Servant.Swagger.UI.Core
47+
48+
exposed-modules: Servant.Swagger.UI.Core
4949
default-language: Haskell2010

‎servant-swagger-ui-example/servant-swagger-ui-example.cabal

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
1-
cabal-version: 2.0
2-
name: servant-swagger-ui-example
3-
version: 0
1+
cabal-version: 2.0
2+
name: servant-swagger-ui-example
3+
version: 0
4+
synopsis: servant-swagger-ui example
5+
category: Web, Servant, Swagger
6+
description: A kind of test-suite of servant-swagger-ui
7+
homepage: https://github.com/haskell-servant/servant-swagger-ui
8+
bug-reports:
9+
https://github.com/haskell-servant/servant-swagger-ui/issues
410

5-
synopsis: servant-swagger-ui example
6-
category: Web, Servant, Swagger
7-
description:
8-
A kind of test-suite of servant-swagger-ui
9-
10-
homepage: https://github.com/haskell-servant/servant-swagger-ui
11-
bug-reports: https://github.com/haskell-servant/servant-swagger-ui/issues
12-
author: Oleg Grenrus <[email protected]>
13-
maintainer: [email protected]
14-
license: BSD3
15-
license-file: LICENSE
16-
build-type: Simple
17-
tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
11+
author: Oleg Grenrus <[email protected]>
12+
maintainer: [email protected]
13+
license: BSD3
14+
license-file: LICENSE
15+
build-type: Simple
16+
tested-with:
17+
GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
1818

1919
source-repository head
20-
type: git
20+
type: git
2121
location: https://github.com/haskell-servant/servant-swagger-ui
2222

2323
executable servant-swagger-ui-example
24-
main-is: Main.hs
24+
main-is: Main.hs
25+
ghc-options: -threaded
2526
build-depends:
26-
base >=4.7 && <4.13
27+
aeson >=0.8.0.2 && <1.5
28+
, base >=4.7 && <4.13
29+
, base-compat >=0.9.3 && <0.11
30+
, lens >=4.7.0.1 && <4.18
2731
, servant
2832
, servant-server
2933
, servant-swagger
@@ -33,10 +37,8 @@ executable servant-swagger-ui-example
3337
, servant-swagger-ui-redoc
3438
, swagger2
3539
, text
36-
, aeson >=0.8.0.2 && <1.5
37-
, base-compat >=0.9.3 && <0.11
38-
, lens >=4.7.0.1 && <4.18
39-
, wai >=3.0.3.0 && <3.3
40-
, warp >=3.0.13.1 && <3.3
41-
hs-source-dirs: src
42-
default-language: Haskell2010
40+
, wai >=3.0.3.0 && <3.3
41+
, warp >=3.0.13.1 && <3.3
42+
43+
hs-source-dirs: src
44+
default-language: Haskell2010

‎servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 78 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,93 @@
1-
cabal-version: 1.12
2-
name: servant-swagger-ui-jensoleg
3-
version: 0.3.2
4-
x-revision: 2
5-
6-
synopsis: Servant swagger ui: Jens-Ole Graulund theme
7-
category: Web, Servant, Swagger
1+
cabal-version: 1.12
2+
name: servant-swagger-ui-jensoleg
3+
version: 0.3.2
4+
x-revision: 3
5+
synopsis: Servant swagger ui: Jens-Ole Graulund theme
6+
category: Web, Servant, Swagger
87
description:
98
Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
109
.
1110
Jsn-Ole Graulund theme https://github.com/jensoleg/swagger-org
1211

13-
homepage: https://github.com/haskell-servant/servant-swagger-ui
14-
bug-reports: https://github.com/haskell-servant/servant-swagger-ui/issues
15-
author: Oleg Grenrus <[email protected]>
16-
maintainer: [email protected]
17-
license: BSD3
18-
license-file: LICENSE
19-
build-type: Simple
20-
tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
12+
homepage: https://github.com/haskell-servant/servant-swagger-ui
13+
bug-reports:
14+
https://github.com/haskell-servant/servant-swagger-ui/issues
15+
16+
author: Oleg Grenrus <[email protected]>
17+
maintainer: [email protected]
18+
license: BSD3
19+
license-file: LICENSE
20+
build-type: Simple
21+
tested-with:
22+
GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
2123

2224
extra-source-files:
23-
jensoleg.index.html.tmpl
24-
jensoleg-dist/css/api-explorer.css
25-
jensoleg-dist/css/index.css
26-
jensoleg-dist/css/print.css
27-
jensoleg-dist/css/reset.css
28-
jensoleg-dist/css/screen.css
29-
jensoleg-dist/css/standalone.css
30-
jensoleg-dist/css/typography.css
31-
jensoleg-dist/fonts/droid-sans-v6-latin-700.eot
32-
jensoleg-dist/fonts/droid-sans-v6-latin-700.svg
33-
jensoleg-dist/fonts/droid-sans-v6-latin-700.ttf
34-
jensoleg-dist/fonts/droid-sans-v6-latin-700.woff
35-
jensoleg-dist/fonts/droid-sans-v6-latin-700.woff2
36-
jensoleg-dist/fonts/droid-sans-v6-latin-regular.eot
37-
jensoleg-dist/fonts/droid-sans-v6-latin-regular.svg
38-
jensoleg-dist/fonts/droid-sans-v6-latin-regular.ttf
39-
jensoleg-dist/fonts/droid-sans-v6-latin-regular.woff
40-
jensoleg-dist/fonts/droid-sans-v6-latin-regular.woff2
41-
jensoleg-dist/images/explorer_icons.png
42-
jensoleg-dist/images/favicon-16x16.png
43-
jensoleg-dist/images/favicon-32x32.png
44-
jensoleg-dist/images/favicon.ico
45-
jensoleg-dist/images/json_editor_integration.png
46-
jensoleg-dist/images/logo_small.png
47-
jensoleg-dist/images/pet_store_api.png
48-
jensoleg-dist/images/senodio.png
49-
jensoleg-dist/images/Swagger_explorer.png
50-
jensoleg-dist/images/Swagger_explorer_min.png
51-
jensoleg-dist/images/throbber.gif
52-
jensoleg-dist/images/wordnik_api.png
53-
jensoleg-dist/index.html
54-
jensoleg-dist/lib/backbone-min.js
55-
jensoleg-dist/lib/bootstrap.min.js
56-
jensoleg-dist/lib/handlebars-2.0.0.js
57-
jensoleg-dist/lib/highlight.7.3.pack.js
58-
jensoleg-dist/lib/jquery-1.8.0.min.js
59-
jensoleg-dist/lib/jquery.ba-bbq.min.js
60-
jensoleg-dist/lib/jquery.slideto.min.js
61-
jensoleg-dist/lib/jquery.wiggle.min.js
62-
jensoleg-dist/lib/jsoneditor.js
63-
jensoleg-dist/lib/marked.js
64-
jensoleg-dist/lib/swagger-oauth.js
65-
jensoleg-dist/lib/underscore-min.js
66-
jensoleg-dist/moncierge.json
67-
jensoleg-dist/o2c.html
68-
jensoleg-dist/petstore.json
69-
jensoleg-dist/swagger-ui.js
70-
jensoleg-dist/swagger-ui.min.js
71-
jensoleg-dist/swagger.json
25+
jensoleg.index.html.tmpl
26+
jensoleg-dist/css/api-explorer.css
27+
jensoleg-dist/css/index.css
28+
jensoleg-dist/css/print.css
29+
jensoleg-dist/css/reset.css
30+
jensoleg-dist/css/screen.css
31+
jensoleg-dist/css/standalone.css
32+
jensoleg-dist/css/typography.css
33+
jensoleg-dist/fonts/droid-sans-v6-latin-700.eot
34+
jensoleg-dist/fonts/droid-sans-v6-latin-700.svg
35+
jensoleg-dist/fonts/droid-sans-v6-latin-700.ttf
36+
jensoleg-dist/fonts/droid-sans-v6-latin-700.woff
37+
jensoleg-dist/fonts/droid-sans-v6-latin-700.woff2
38+
jensoleg-dist/fonts/droid-sans-v6-latin-regular.eot
39+
jensoleg-dist/fonts/droid-sans-v6-latin-regular.svg
40+
jensoleg-dist/fonts/droid-sans-v6-latin-regular.ttf
41+
jensoleg-dist/fonts/droid-sans-v6-latin-regular.woff
42+
jensoleg-dist/fonts/droid-sans-v6-latin-regular.woff2
43+
jensoleg-dist/images/explorer_icons.png
44+
jensoleg-dist/images/favicon-16x16.png
45+
jensoleg-dist/images/favicon-32x32.png
46+
jensoleg-dist/images/favicon.ico
47+
jensoleg-dist/images/json_editor_integration.png
48+
jensoleg-dist/images/logo_small.png
49+
jensoleg-dist/images/pet_store_api.png
50+
jensoleg-dist/images/senodio.png
51+
jensoleg-dist/images/Swagger_explorer.png
52+
jensoleg-dist/images/Swagger_explorer_min.png
53+
jensoleg-dist/images/throbber.gif
54+
jensoleg-dist/images/wordnik_api.png
55+
jensoleg-dist/index.html
56+
jensoleg-dist/lib/backbone-min.js
57+
jensoleg-dist/lib/bootstrap.min.js
58+
jensoleg-dist/lib/handlebars-2.0.0.js
59+
jensoleg-dist/lib/highlight.7.3.pack.js
60+
jensoleg-dist/lib/jquery-1.8.0.min.js
61+
jensoleg-dist/lib/jquery.ba-bbq.min.js
62+
jensoleg-dist/lib/jquery.slideto.min.js
63+
jensoleg-dist/lib/jquery.wiggle.min.js
64+
jensoleg-dist/lib/jsoneditor.js
65+
jensoleg-dist/lib/marked.js
66+
jensoleg-dist/lib/swagger-oauth.js
67+
jensoleg-dist/lib/underscore-min.js
68+
jensoleg-dist/moncierge.json
69+
jensoleg-dist/o2c.html
70+
jensoleg-dist/petstore.json
71+
jensoleg-dist/swagger-ui.js
72+
jensoleg-dist/swagger-ui.min.js
73+
jensoleg-dist/swagger.json
7274

7375
source-repository head
74-
type: git
76+
type: git
7577
location: https://github.com/haskell-servant/servant-swagger-ui
7678

7779
library
78-
hs-source-dirs:
79-
src
80-
ghc-options: -Wall
81-
80+
hs-source-dirs: src
81+
ghc-options: -Wall
82+
build-depends: servant-swagger-ui-core >=0.3.2 && <0.4
8283
build-depends:
83-
servant-swagger-ui-core >=0.3.2 && <0.4
84+
base >=4.7 && <4.13
85+
, bytestring >=0.10.4.0 && <0.11
86+
, file-embed-lzma >=0 && <0.1
87+
, servant >=0.14 && <0.17
88+
, servant-server >=0.14 && <0.17
89+
, swagger2 >=2.3.0.1 && <2.5
90+
, text >=1.2.3.0 && <1.3
8491

85-
build-depends:
86-
base >=4.7 && <4.13
87-
, bytestring >=0.10.4.0 && <0.11
88-
, file-embed-lzma >=0 && <0.1
89-
, servant >=0.14 && <0.17
90-
, servant-server >=0.14 && <0.17
91-
, swagger2 >=2.3.0.1 && <2.4
92-
, text >=1.2.3.0 && <1.3
93-
exposed-modules:
94-
Servant.Swagger.UI.JensOleG
92+
exposed-modules: Servant.Swagger.UI.JensOleG
9593
default-language: Haskell2010

0 commit comments

Comments
 (0)