git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1008 from phadej/lower-ghc-8.0

Support only GHC-8.0+

commit720bb40645228cc43fda473401be7746594b54a3 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Jul 2018, 01:12 (8 years ago) parent0ccf6985ba0e43
21 files changed+30−67
compare with master
unifiedsplit
.travis.yml−6 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1 doc/cookbook/file-upload/file-upload.cabal+1−1 doc/cookbook/generic/generic.cabal+1−1 doc/cookbook/https/https.cabal+1−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−4 doc/cookbook/pagination/dummy/Pagination.lhs−5 doc/cookbook/pagination/pagination.cabal+7−16 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/cookbook/using-free-client/using-free-client.cabal+2−2 doc/tutorial/tutorial.cabal−2 servant-client-core/servant-client-core.cabal−2 servant-client/servant-client.cabal−2 servant-docs/servant-docs.cabal−2 servant-foreign/servant-foreign.cabal−2 servant-server/servant-server.cabal+1−3 servant/servant.cabal+10−12 stack.yaml+1−1
.travis.yml−6
@@ -41,12 +41,6 @@ matrix:
4141 - compiler: "ghc-8.0.2"
4242 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4343 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
44− - compiler: "ghc-7.10.3"
45− # env: TEST=--disable-tests BENCH=--disable-benchmarks
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
47− - compiler: "ghc-7.8.4"
48− # env: TEST=--disable-tests BENCH=--disable-benchmarks
49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
5044
5145before_install:
5246 - HC=${CC}
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-db-postgres-pool
1414 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-db-sqlite-simple
1414 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-using-custom-monad
1414 main-is: Generic.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-https
1414 main-is: Https.lhs
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−4
@@ -11,12 +11,9 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
14+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1515
1616executable cookbook-jwt-and-basic-auth
17− if !impl(ghc >= 7.10)
18− buildable: False
19−
2017 main-is: JWTAndBasicAuth.lhs
2118 build-depends: base == 4.*
2219 , text >= 1.2
doc/cookbook/pagination/dummy/Pagination.lhsdeleted−5
@@ -1,5 +0,0 @@
1−```haskell
2−module Main (main) where
3−main :: IO ()
4−main = return ()
5−```
doc/cookbook/pagination/pagination.cabal+7−16
@@ -8,25 +8,16 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−extra-source-files:
12− Pagination.lhs
13− dummy/Pagination.lhs
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1512
1613executable cookbook-pagination
1714 main-is: Pagination.lhs
1815 build-tool-depends: markdown-unlit:markdown-unlit
1916 default-language: Haskell2010
2017 ghc-options: -Wall -pgmL markdown-unlit
21−
22− if impl(ghc >= 8.0)
23− hs-source-dirs: .
24− build-depends: base >= 4.8 && <4.12
25− , aeson
26− , servant
27− , servant-server
28− , servant-pagination >= 2.1.0 && < 3.0.0
29− , warp
30− else
31− hs-source-dirs: dummy
32− build-depends: base
18+ build-depends: base >= 4.8 && <4.12
19+ , aeson
20+ , servant
21+ , servant-server
22+ , servant-pagination >= 2.1.0 && < 3.0.0
23+ , warp
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/cookbook/using-free-client/using-free-client.cabal+2−2
@@ -8,11 +8,11 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
11+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
1212
1313executable cookbook-using-free-client
1414 main-is: UsingFreeClient.lhs
15− build-depends: base == 4.*
15+ build-depends: base >= 4.9 && <5
1616 , free
1717 , servant
1818 , servant-client
doc/tutorial/tutorial.cabal−2
@@ -13,8 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1313build-type: Simple
1414cabal-version: >=1.10
1515tested-with:
16− GHC==7.8.4
17− GHC==7.10.3
1816 GHC==8.0.2
1917 GHC==8.2.2
2018 GHC==8.4.3
servant-client-core/servant-client-core.cabal−2
@@ -19,8 +19,6 @@ extra-source-files:
1919 CHANGELOG.md
2020 README.md
2121tested-with:
22− GHC==7.8.4
23− GHC==7.10.3
2422 GHC==8.0.2
2523 GHC==8.2.2
2624 GHC==8.4.3
servant-client/servant-client.cabal−2
@@ -17,8 +17,6 @@ category: Servant, Web
1717build-type: Simple
1818cabal-version: >=1.10
1919tested-with:
20− GHC==7.8.4
21− GHC==7.10.3
2220 GHC==8.0.2
2321 GHC==8.2.2
2422 GHC==8.4.3
servant-docs/servant-docs.cabal−2
@@ -17,8 +17,6 @@ category: Servant, Web
1717build-type: Simple
1818cabal-version: >=1.10
1919tested-with:
20− GHC==7.8.4
21− GHC==7.10.3
2220 GHC==8.0.2
2321 GHC==8.2.2
2422 GHC==8.4.3
servant-foreign/servant-foreign.cabal−2
@@ -24,8 +24,6 @@ extra-source-files:
2424 README.md
2525bug-reports: http://github.com/haskell-servant/servant/issues
2626tested-with:
27− GHC==7.8.4
28− GHC==7.10.3
2927 GHC==8.0.2
3028 GHC==8.2.2
3129 GHC==8.4.3
servant-server/servant-server.cabal+1−3
@@ -22,8 +22,6 @@ category: Servant, Web
2222build-type: Custom
2323cabal-version: >=1.10
2424tested-with:
25− GHC==7.8.4
26− GHC==7.10.3
2725 GHC==8.0.2
2826 GHC==8.2.2
2927 GHC==8.4.3
@@ -181,7 +179,7 @@ test-suite doctests
181179 build-depends:
182180 base
183181 , servant-server
184− , doctest >= 0.15.0 && <0.16
182+ , doctest >= 0.16.0 && <0.17
185183 type: exitcode-stdio-1.0
186184 main-is: test/doctests.hs
187185 buildable: True
servant/servant.cabal+10−12
@@ -18,8 +18,6 @@ category: Servant, Web
1818build-type: Custom
1919cabal-version: >=1.10
2020tested-with:
21− GHC==7.8.4
22− GHC==7.10.3
2321 GHC==8.0.2
2422 GHC==8.2.2
2523 GHC==8.4.3
@@ -74,22 +72,22 @@ library
7472 --
7573 -- note: mtl lower bound is so low because of GHC-7.8
7674 build-depends:
77− base >= 4.7 && < 4.12
78− , bytestring >= 0.10.4.0 && < 0.11
75+ base >= 4.9 && < 4.12
76+ , bytestring >= 0.10.8.1 && < 0.11
7977 , mtl >= 2.1 && < 2.3
8078 , text >= 1.2.3.0 && < 1.3
8179
8280 if !impl(ghc >= 8.0)
8381 build-depends:
84− semigroups >= 0.18.4 && < 0.19
82+ semigroups >= 0.18.5 && < 0.19
8583
8684 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8785 -- Here can be exceptions if we really need features from the newer versions.
8886 build-depends:
89− base-compat >= 0.10.1 && < 0.11
87+ base-compat >= 0.10.4 && < 0.11
9088 , aeson >= 1.3.1.1 && < 1.5
9189 , attoparsec >= 0.13.2.2 && < 0.14
92− , case-insensitive >= 1.2.0.10 && < 1.3
90+ , case-insensitive >= 1.2.0.11 && < 1.3
9391 , http-api-data >= 0.3.8.1 && < 0.4
9492 , http-media >= 0.7.1.2 && < 0.8
9593 , http-types >= 0.12.1 && < 0.13
@@ -154,23 +152,23 @@ test-suite spec
154152
155153 -- Additonal dependencies
156154 build-depends:
157− aeson-compat >= 0.3.7.1 && < 0.4
158− , hspec >= 2.5.1 && < 2.6
155+ aeson-compat >= 0.3.8 && < 0.4
156+ , hspec >= 2.5.4 && < 2.6
159157 , QuickCheck >= 2.11.3 && < 2.12
160158 , quickcheck-instances >= 0.3.18 && < 0.4
161159
162160 build-tool-depends:
163− hspec-discover:hspec-discover >= 2.5.1 && < 2.6
161+ hspec-discover:hspec-discover >= 2.5.4 && < 2.6
164162
165163test-suite doctests
166164 build-depends:
167165 base
168166 , servant
169− , doctest >= 0.15.0 && <0.16
167+ , doctest >= 0.16.0 && <0.17
170168
171169 -- We test Links failure with doctest, so we need extra dependencies
172170 build-depends:
173− hspec >= 2.5.1 && < 2.6
171+ hspec >= 2.5.4 && < 2.6
174172
175173 type: exitcode-stdio-1.0
176174 main-is: test/doctests.hs
stack.yaml+1−1
@@ -1,5 +1,5 @@
11# Let's try to keep resolver at the first day of the month
2−resolver: nightly-2018-06-01
2+resolver: nightly-2018-07-08
33packages:
44- servant-client/
55- servant-client-core/