5e159fa · typeable/servant-swagger-ui

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

Merge pull request #14 from phadej/servant-0.9

Support servant-0.9

commit5e159fa42bc8ee28c8b67c265e29e5c1cf99223c authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 23 Sep 2016, 11:03 (10 years ago) parentfe842c1 0918877

6 files changed+49−11

compare with master

unifiedsplit

.travis.meta.yml+3 .travis.yml+30 package.yaml+3−3 servant-0.9-cabal.config+1 servant-swagger-ui.cabal+6−6 stack.yaml+6−2

.travis.meta.yml+3

@@ -2,17 +2,20 @@ language: haskell-multi-ghc

33env:

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

5+ - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.9-cabal.config

56 - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.8-cabal.config

67 - GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.7-cabal.config

89 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=swagger2-2.1-cabal.config

910 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=swagger2-2.0-cabal.config

11+ - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.9-cabal.config

1012 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.8-cabal.config

1113 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.7-cabal.config

1214 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.6-cabal.config

1315 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.5-cabal.config

1416 - GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.4-cabal.config

1517

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

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

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

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

.travis.yml+30

@@ -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.9-cabal.config

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.9-cabal.config'

5767 - env: GHCVER=8.0.1 CABALVER=1.24 CABALCONFIG=servant-0.8-cabal.config

5868 addons:

5969 apt:

@@ -94,6 +104,16 @@ matrix:

94104 - ghc-7.10.3

95105 - libgmp-dev

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

107+ - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.9-cabal.config

108+ addons:

109+ apt:

110+ sources:

111+ - hvr-ghc

112+ packages:

113+ - cabal-install-1.22

114+ - ghc-7.10.3

115+ - libgmp-dev

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

97117 - env: GHCVER=7.10.3 CABALVER=1.22 CABALCONFIG=servant-0.8-cabal.config

98118 addons:

99119 apt:

@@ -144,6 +164,16 @@ matrix:

144164 - ghc-7.10.3

145165 - libgmp-dev

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

167+ - env: GHCVER=7.8.4 CABALVER=1.18 CABALCONFIG=servant-0.9-cabal.config

168+ addons:

169+ apt:

170+ sources:

171+ - hvr-ghc

172+ packages:

173+ - cabal-install-1.18

174+ - ghc-7.8.4

175+ - libgmp-dev

176+ compiler: ! ': # ghc-7.8.4 cabal-1.18 servant-0.9-cabal.config'

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

148178 addons:

149179 apt:

package.yaml+3−3

@@ -24,9 +24,9 @@ dependencies:

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

2525 - filepath >=1.3.0.2 && <1.5

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

27− - servant >=0.4.4.5 && <0.9

27+ - servant >=0.4.4.5 && <0.10

2828 - servant-blaze >=0.4.4.5 && <0.9

29− - servant-server >=0.4.4.5 && <0.9

29+ - servant-server >=0.4.4.5 && <0.10

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

3131 - swagger2 >=2.0.1 && <2.2

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

@@ -60,7 +60,7 @@ tests:

6060 source-dirs: example

6161 dependencies:

6262 - servant-swagger-ui

63− - servant-server >=0.4.4.5 && <0.9

63+ - servant-server >=0.4.4.5 && <0.10

6464 - aeson >=0.8.0.2 && <1.1

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

6666 - lens >=4.7.0.1 && <4.15

servant-0.9-cabal.confignew file+1

@@ -0,0 +1 @@

1+constraints: servant ==0.9.*

servant-swagger-ui.cabal+6−6

@@ -1,4 +1,4 @@

1−-- This file has been generated from package.yaml by hpack version 0.14.0.

1+-- This file has been generated from package.yaml by hpack version 0.15.0.

22--

33-- see: https://github.com/sol/hpack

@@ -91,9 +91,9 @@ library

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

9292 , filepath >=1.3.0.2 && <1.5

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

94− , servant >=0.4.4.5 && <0.9

94+ , servant >=0.4.4.5 && <0.10

9595 , servant-blaze >=0.4.4.5 && <0.9

96− , servant-server >=0.4.4.5 && <0.9

96+ , servant-server >=0.4.4.5 && <0.10

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

9898 , swagger2 >=2.0.1 && <2.2

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

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

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

128128 , filepath >=1.3.0.2 && <1.5

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

130− , servant >=0.4.4.5 && <0.9

130+ , servant >=0.4.4.5 && <0.10

131131 , servant-blaze >=0.4.4.5 && <0.9

132− , servant-server >=0.4.4.5 && <0.9

132+ , servant-server >=0.4.4.5 && <0.10

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

134134 , swagger2 >=2.0.1 && <2.2

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

136136 , text >=1.2.0.6 && <1.3

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

138138 , servant-swagger-ui

139− , servant-server >=0.4.4.5 && <0.9

139+ , servant-server >=0.4.4.5 && <0.10

140140 , aeson >=0.8.0.2 && <1.1

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

142142 , lens >=4.7.0.1 && <4.15

stack.yaml+6−2

@@ -1,5 +1,9 @@

1−resolver: nightly-2016-08-05

1+resolver: nightly-2016-09-22

22packages:

33- '.'

4−extra-deps: []

4+extra-deps:

5+- http-api-data-0.3

6+- servant-0.9

7+- servant-server-0.9

8+- uri-bytestring-0.2.2.0

59flags: {}