1c82b1d · typeable/servant-swagger-ui

git.iko.soy/typeable/servant-swagger-ui

Support servant-0.8

commit1c82b1d31ad8af56abf66215b4e95b778716545a authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 11 Jul 2016, 12:36 (10 years ago) parente929f23

4 files changed+62−29

compare with master

unifiedsplit

.travis.meta.yml+9−6 .travis.yml+42−12 package.yaml+4−4 servant-swagger-ui.cabal+7−7

.travis.meta.yml+9−6

@@ -2,19 +2,22 @@ language: haskell-multi-ghc

33env:

44 - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=swagger2-2.1-cabal.config PEDANTIC=YES

5+ - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.8-cabal.config PEDANTIC=YES

56 - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.7-cabal.config PEDANTIC=YES

78 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=swagger2-2.1-cabal.config PEDANTIC=YES

89 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=swagger2-2.0-cabal.config PEDANTIC=YES

9− - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.4-cabal.config PEDANTIC=YES

10− - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.5-cabal.config PEDANTIC=YES

11− - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.6-cabal.config PEDANTIC=YES

10+ - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.8-cabal.config PEDANTIC=YES

1211 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.7-cabal.config PEDANTIC=YES

12+ - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.6-cabal.config PEDANTIC=YES

13+ - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.5-cabal.config PEDANTIC=YES

14+ - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.4-cabal.config PEDANTIC=YES

1315

14− - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.4-cabal.config

15− - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.5-cabal.config

16− - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.6-cabal.config

16+ - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.8-cabal.config

1717 - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.7-cabal.config

18+ - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.6-cabal.config

19+ - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.5-cabal.config

20+ - GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.4-cabal.config

1821

1922matrix:

2023 fast_finish: true

.travis.yml+42−12

@@ -54,6 +54,16 @@ matrix:

5454 - ghc-8.0.1

5555 - libgmp-dev

5656 compiler: ! ': # ghc-8.0.1 cabal-1.24 swagger2-2.1-cabal.config'

57+ - env: GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.8-cabal.config PEDANTIC=YES

58+ addons:

59+ apt:

60+ sources:

61+ - hvr-ghc

62+ packages:

63+ - cabal-install-1.24

64+ - ghc-8.0.1

65+ - libgmp-dev

66+ compiler: ! ': # ghc-8.0.1 cabal-1.24 servant-0.8-cabal.config'

5767 - env: GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.7-cabal.config PEDANTIC=YES

5868 addons:

5969 apt:

@@ -84,7 +94,7 @@ matrix:

8494 - ghc-7.10.3

8595 - libgmp-dev

8696 compiler: ! ': # ghc-7.10.3 cabal-1.22 swagger2-2.0-cabal.config'

87− - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.4-cabal.config PEDANTIC=YES

97+ - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.8-cabal.config PEDANTIC=YES

8898 addons:

8999 apt:

90100 sources:

@@ -93,8 +103,8 @@ matrix:

93103 - cabal-install-1.22

94104 - ghc-7.10.3

95105 - libgmp-dev

96− compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.4-cabal.config'

97− - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.5-cabal.config PEDANTIC=YES

106+ compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.8-cabal.config'

107+ - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.7-cabal.config PEDANTIC=YES

98108 addons:

99109 apt:

100110 sources:

@@ -103,7 +113,7 @@ matrix:

103113 - cabal-install-1.22

104114 - ghc-7.10.3

105115 - libgmp-dev

106− compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.5-cabal.config'

116+ compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.7-cabal.config'

107117 - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.6-cabal.config PEDANTIC=YES

108118 addons:

109119 apt:

@@ -114,7 +124,7 @@ matrix:

114124 - ghc-7.10.3

115125 - libgmp-dev

116126 compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.6-cabal.config'

117− - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.7-cabal.config PEDANTIC=YES

127+ - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.5-cabal.config PEDANTIC=YES

118128 addons:

119129 apt:

120130 sources:

@@ -123,8 +133,18 @@ matrix:

123133 - cabal-install-1.22

124134 - ghc-7.10.3

125135 - libgmp-dev

126− compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.7-cabal.config'

127− - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.4-cabal.config

136+ compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.5-cabal.config'

137+ - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.4-cabal.config PEDANTIC=YES

138+ addons:

139+ apt:

140+ sources:

141+ - hvr-ghc

142+ packages:

143+ - cabal-install-1.22

144+ - ghc-7.10.3

145+ - libgmp-dev

146+ compiler: ! ': # ghc-7.10.3 cabal-1.22 servant-0.4-cabal.config'

147+ - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.8-cabal.config

128148 addons:

129149 apt:

130150 sources:

@@ -133,8 +153,8 @@ matrix:

133153 - cabal-install-1.18

134154 - ghc-7.8.4

135155 - libgmp-dev

136− compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.4-cabal.config'

137− - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.5-cabal.config

156+ compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.8-cabal.config'

157+ - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.7-cabal.config

138158 addons:

139159 apt:

140160 sources:

@@ -143,7 +163,7 @@ matrix:

143163 - cabal-install-1.18

144164 - ghc-7.8.4

145165 - libgmp-dev

146− compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.5-cabal.config'

166+ compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.7-cabal.config'

147167 - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.6-cabal.config

148168 addons:

149169 apt:

@@ -154,7 +174,7 @@ matrix:

154174 - ghc-7.8.4

155175 - libgmp-dev

156176 compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.6-cabal.config'

157− - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.7-cabal.config

177+ - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.5-cabal.config

158178 addons:

159179 apt:

160180 sources:

@@ -163,7 +183,17 @@ matrix:

163183 - cabal-install-1.18

164184 - ghc-7.8.4

165185 - libgmp-dev

166− compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.7-cabal.config'

186+ compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.5-cabal.config'

187+ - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.4-cabal.config

188+ addons:

189+ apt:

190+ sources:

191+ - hvr-ghc

192+ packages:

193+ - cabal-install-1.18

194+ - ghc-7.8.4

195+ - libgmp-dev

196+ compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.4-cabal.config'

167197branches:

168198 only:

169199 - master

package.yaml+4−4

@@ -23,9 +23,9 @@ dependencies:

2323 - file-embed >=0.0.9 && <0.1

2424 - filepath >=1.3.0.2 && <1.5

2525 - http-media >=0.6.2 && <0.8

26− - servant >=0.4.4.5 && <0.8

27− - servant-blaze >=0.4.4.5 && <0.8

28− - servant-server >=0.4.4.5 && <0.8

26+ - servant >=0.4.4.5 && <0.9

27+ - servant-blaze >=0.4.4.5 && <0.9

28+ - servant-server >=0.4.4.5 && <0.9

2929 - servant-swagger >=1.0.3 && <1.2

3030 - swagger2 >=2.0.1 && <2.2

3131 - template-haskell >=2.9 && <2.12

@@ -41,7 +41,7 @@ tests:

4141 source-dirs: example

4242 dependencies:

4343 - servant-swagger-ui

44− - servant-server >=0.4.4.5 && <0.8

44+ - servant-server >=0.4.4.5 && <0.9

4545 - aeson >=0.8.0.2 && <0.12

4646 - base-compat >=0.6.0 && <0.10

4747 - lens >=4.7.0.1 && <4.15

servant-swagger-ui.cabal+7−7

@@ -81,9 +81,9 @@ library

8181 , file-embed >=0.0.9 && <0.1

8282 , filepath >=1.3.0.2 && <1.5

8383 , http-media >=0.6.2 && <0.8

84− , servant >=0.4.4.5 && <0.8

85− , servant-blaze >=0.4.4.5 && <0.8

86− , servant-server >=0.4.4.5 && <0.8

84+ , servant >=0.4.4.5 && <0.9

85+ , servant-blaze >=0.4.4.5 && <0.9

86+ , servant-server >=0.4.4.5 && <0.9

8787 , servant-swagger >=1.0.3 && <1.2

8888 , swagger2 >=2.0.1 && <2.2

8989 , template-haskell >=2.9 && <2.12

@@ -108,16 +108,16 @@ test-suite example

108108 , file-embed >=0.0.9 && <0.1

109109 , filepath >=1.3.0.2 && <1.5

110110 , http-media >=0.6.2 && <0.8

111− , servant >=0.4.4.5 && <0.8

112− , servant-blaze >=0.4.4.5 && <0.8

113− , servant-server >=0.4.4.5 && <0.8

111+ , servant >=0.4.4.5 && <0.9

112+ , servant-blaze >=0.4.4.5 && <0.9

113+ , servant-server >=0.4.4.5 && <0.9

114114 , servant-swagger >=1.0.3 && <1.2

115115 , swagger2 >=2.0.1 && <2.2

116116 , template-haskell >=2.9 && <2.12

117117 , text >=1.2.0.6 && <1.3

118118 , wai-app-static >=3.0.1.1 && <3.2

119119 , servant-swagger-ui

120− , servant-server >=0.4.4.5 && <0.8

120+ , servant-server >=0.4.4.5 && <0.9

121121 , aeson >=0.8.0.2 && <0.12

122122 , base-compat >=0.6.0 && <0.10

123123 , lens >=4.7.0.1 && <4.15