0391e23 · typeable/servant-swagger-ui

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

Allow aeson-1.4

commit0391e23aa08204fe397a05bddb8d409b2b3f77e5 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 12 Jun 2018, 14:16 (8 years ago) parent686d76b

6 files changed+22−15

compare with master

unifiedsplit

.travis.yml+16−9 servant-swagger-ui-core/servant-swagger-ui-core.cabal+1−1 servant-swagger-ui-example/servant-swagger-ui-example.cabal+2−2 servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+1−1 servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+1−1 servant-swagger-ui/servant-swagger-ui.cabal+1−1

.travis.yml+16−9

@@ -32,21 +32,21 @@ before_cache:

3232

3333matrix:

3434 include:

35− - compiler: "ghc-7.8.4"

35+ - compiler: "ghc-8.4.3"

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

37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}

38− - compiler: "ghc-7.10.3"

37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

38+ - compiler: "ghc-8.2.2"

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

40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}

40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}

4141 - compiler: "ghc-8.0.2"

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

43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}

44− - compiler: "ghc-8.2.2"

43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}

44+ - compiler: "ghc-7.10.3"

4545 # 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.2"

46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}

47+ - compiler: "ghc-7.8.4"

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

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

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

5050

5151before_install:

5252 - HC=${CC}

@@ -127,18 +127,25 @@ script:

127127 - rm -rf ./dist-newstyle

128128 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

129129

130+ # Constraint set servant-0.7

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

131132

133+ # Constraint set servant-0.8

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

133135

136+ # Constraint set servant-0.9

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

135138

139+ # Constraint set servant-0.10

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

137141

142+ # Constraint set servant-0.11

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

139144

145+ # Constraint set servant-0.12

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

141147

148+ # Constraint set servant-0.13

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

143150

144151# REGENDATA ["--branch","master","--output",".travis.yml","--config","cabal.project"]

servant-swagger-ui-core/servant-swagger-ui-core.cabal+1−1

@@ -18,7 +18,7 @@ maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

1818license: BSD3

1919license-file: LICENSE

2020build-type: Simple

21−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.2

21+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3

2222

2323source-repository head

2424 type: git

servant-swagger-ui-example/servant-swagger-ui-example.cabal+2−2

@@ -14,7 +14,7 @@ maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

1414license: BSD3

1515license-file: LICENSE

1616build-type: Simple

17−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.2

17+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3

1818

1919source-repository head

2020 type: git

@@ -33,7 +33,7 @@ executable servant-swagger-ui-example

3333 , servant-swagger-ui-redoc

3434 , swagger2

3535 , text

36− , aeson >=0.8.0.2 && <1.4

36+ , aeson >=0.8.0.2 && <1.5

3737 , base-compat >=0.9.3 && <0.11

3838 , lens >=4.7.0.1 && <4.17

3939 , wai >=3.0.3.0 && <3.3

servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+1−1

@@ -16,7 +16,7 @@ maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

1616license: BSD3

1717license-file: LICENSE

1818build-type: Simple

19−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.2

19+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3

2020

2121extra-source-files:

2222 jensoleg.index.html.tmpl

servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+1−1

@@ -16,7 +16,7 @@ maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

1616license: BSD3

1717license-file: LICENSE

1818build-type: Simple

19−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.2

19+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3

2020

2121extra-source-files:

2222 redoc-dist-1.21.2/redoc.min.js

servant-swagger-ui/servant-swagger-ui.cabal+1−1

@@ -13,7 +13,7 @@ maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

1313license: BSD3

1414license-file: LICENSE

1515build-type: Simple

16−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.2

16+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3

1717

1818extra-source-files:

1919 CHANGELOG.md