e785afa · typeable/servant-swagger-ui

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

Update 2016-05-10

commite785afacafc1d9412231d2e6c50c63852738f68e authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 10 May 2016, 13:09 (10 years ago) parent8b9cb01

4 files changed+39−17

compare with master

unifiedsplit

.travis.meta.yml+2 .travis.yml+20 package.yaml+6−6 servant-swagger-ui.cabal+11−11

.travis.meta.yml+2

@@ -7,6 +7,8 @@ env:

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

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

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

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

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

1012

1113matrix:

1214 fast_finish: true

.travis.yml+20

@@ -105,6 +105,26 @@ matrix:

105105 - ghc-7.10.3

106106 - libgmp-dev

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

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

109+ addons:

110+ apt:

111+ sources:

112+ - hvr-ghc

113+ packages:

114+ - cabal-install-1.18

115+ - ghc-7.8.4

116+ - libgmp-dev

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

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

119+ addons:

120+ apt:

121+ sources:

122+ - hvr-ghc

123+ packages:

124+ - cabal-install-1.22

125+ - ghc-7.10.3

126+ - libgmp-dev

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

108128branches:

109129 only:

110130 - master

package.yaml+6−6

@@ -22,10 +22,10 @@ dependencies:

2222 - directory >=1.2.1.0 && <1.3

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

2424 - filepath >=1.3.0.2 && <1.5

25− - http-media >=0.6.2 && <0.7

26− - servant >=0.4.4.5 && <0.7

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

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

25+ - 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

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

3030 - swagger2 >=2.0.1 && <2.1

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

@@ -41,9 +41,9 @@ tests:

4141 source-dirs: example

4242 dependencies:

4343 - servant-swagger-ui

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

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

4545 - aeson >=0.8.0.2 && <0.12

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

47− - lens >=4.7.0.1 && <4.14

47+ - lens >=4.7.0.1 && <4.15

4848 - wai >=3.0.3.0 && <3.3

4949 - warp >=3.0.13.1 && <3.3

servant-swagger-ui.cabal+11−11

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

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

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

22--

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

@@ -80,10 +80,10 @@ library

8080 , directory >=1.2.1.0 && <1.3

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

8282 , filepath >=1.3.0.2 && <1.5

83− , http-media >=0.6.2 && <0.7

84− , servant >=0.4.4.5 && <0.7

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

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

83+ , 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

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

8888 , swagger2 >=2.0.1 && <2.1

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

@@ -107,20 +107,20 @@ test-suite example

107107 , directory >=1.2.1.0 && <1.3

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

109109 , filepath >=1.3.0.2 && <1.5

110− , http-media >=0.6.2 && <0.7

111− , servant >=0.4.4.5 && <0.7

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

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

110+ , 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

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

115115 , swagger2 >=2.0.1 && <2.1

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

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.7

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

121121 , aeson >=0.8.0.2 && <0.12

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

123− , lens >=4.7.0.1 && <4.14

123+ , lens >=4.7.0.1 && <4.15

124124 , wai >=3.0.3.0 && <3.3

125125 , warp >=3.0.13.1 && <3.3

126126 default-language: Haskell2010