f20a024 · typeable/servant-swagger-ui

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

on master help sign in

Support GHC-8.4.1

f20a024Oleg Grenrus9 years ago

.travis.yml+5−2

compare with master

unifiedsplit

@@ -44,6 +44,9 @@ matrix:

44 - compiler: "ghc-8.2.2"

45 # env: TEST=--disable-tests BENCH=--disable-benchmarks

46 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

47+ - compiler: "ghc-8.4.1"

48+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

48before_install:

51before_install:

49 - HC=${CC}

52 - HC=${CC}

@@ -75,7 +78,7 @@ install:

75 - rm -f cabal.project.freeze

78 - rm -f cabal.project.freeze

76 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

79 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

77 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

80 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

78− - rm -rf "."/.ghc.environment.* "."/dist

81+ - rm -rf .ghc.environment.* "."/dist

79 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

82 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

81# Here starts the actual work to be performed for the package under test;

84# Here starts the actual work to be performed for the package under test;

@@ -117,7 +120,7 @@ script:

117

120

118 - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.12.*' all; else echo skipping...; fi

121 - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.12.*' all; else echo skipping...; fi

119

122

120− - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi

123+ - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80600 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi

121

124

122# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-swagger-ui.cabal"]

125# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-swagger-ui.cabal"]

123# EOF

126# EOF

cabal.make-travis-yml+1−1

@@ -23,5 +23,5 @@ constraint-set servant-0.12

23 constraints: servant ==0.12.*

25constraint-set servant-0.13

26− ghc: >= 7.8 && <8.4

26+ ghc: >= 7.8 && <8.6

27 constraints: servant ==0.13.*

servant-swagger-ui.cabal+5−4

@@ -1,5 +1,6 @@

1name: servant-swagger-ui

2version: 0.2.5.3.9.1

3+x-revision: 1

3synopsis: Servant swagger ui

4synopsis: Servant swagger ui

4description: Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)

5description: Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)

5category: Web, Servant, Swagger

6category: Web, Servant, Swagger

@@ -9,7 +10,7 @@ author: Oleg Grenrus <oleg.grenrus@iki.fi>

9maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

10maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

10license: BSD3

11license: BSD3

11license-file: LICENSE

12license-file: LICENSE

12−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2

13+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1

13build-type: Simple

14build-type: Simple

14cabal-version: >= 1.10

15cabal-version: >= 1.10

@@ -92,7 +93,7 @@ library

92 ghc-options: -Wall

93 ghc-options: -Wall

94 build-depends:

95 build-depends:

95− base >=4.7 && <4.11

96+ base >=4.7 && <4.12

96 , blaze-markup >=0.7.0.2 && <0.9

97 , blaze-markup >=0.7.0.2 && <0.9

97 , bytestring >=0.10.4.0 && <0.11

98 , bytestring >=0.10.4.0 && <0.11

98 , directory >=1.2.1.0 && <1.4

99 , directory >=1.2.1.0 && <1.4

@@ -104,7 +105,7 @@ library

104 , servant-server >=0.4.4.5 && <0.14

105 , servant-server >=0.4.4.5 && <0.14

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

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

106 , swagger2 >=2.0.1 && <2.3

107 , swagger2 >=2.0.1 && <2.3

107− , template-haskell >=2.9 && <2.13

108+ , template-haskell >=2.9 && <2.14

108 , text >=1.2.0.6 && <1.3

109 , text >=1.2.0.6 && <1.3

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

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

110 if flag(servant-0-5)

111 if flag(servant-0-5)

@@ -135,7 +136,7 @@ test-suite example

135 , servant-swagger-ui

136 , servant-swagger-ui

136 , swagger2

137 , swagger2

137 , text

138 , text

138− , aeson >=0.8.0.2 && <1.3

139+ , aeson >=0.8.0.2 && <1.4

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

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

140 , lens >=4.7.0.1 && <4.17

141 , lens >=4.7.0.1 && <4.17

141 , wai >=3.0.3.0 && <3.3

142 , wai >=3.0.3.0 && <3.3