git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1008 from phadej/lower-ghc-8.0
720bb40Oleg Grenrus
.travis.yml−6
@@ -41,12 +41,6 @@ matrix:
41 - compiler: "ghc-8.0.2"
41 - compiler: "ghc-8.0.2"
42 # env: TEST=--disable-tests BENCH=--disable-benchmarks
42 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
43 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]}}
50
44
51before_install:
45before_install:
52 - HC=${CC}
46 - HC=${CC}
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-basic-auth
13executable cookbook-basic-auth
14 main-is: BasicAuth.lhs
14 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-db-postgres-pool
13executable cookbook-db-postgres-pool
14 main-is: PostgresPool.lhs
14 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-db-sqlite-simple
13executable cookbook-db-sqlite-simple
14 main-is: DBConnection.lhs
14 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-file-upload
13executable cookbook-file-upload
14 main-is: FileUpload.lhs
14 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-using-custom-monad
13executable cookbook-using-custom-monad
14 main-is: Generic.lhs
14 main-is: Generic.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-https
13executable cookbook-https
14 main-is: Https.lhs
14 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
11category: Servant
11category: Servant
12build-type: Simple
12build-type: Simple
13cabal-version: >=1.10
13cabal-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
15
15
16executable cookbook-jwt-and-basic-auth
16executable cookbook-jwt-and-basic-auth
17− if !impl(ghc >= 7.10)
18− buildable: False
19−
20 main-is: JWTAndBasicAuth.lhs
17 main-is: JWTAndBasicAuth.lhs
21 build-depends: base == 4.*
18 build-depends: base == 4.*
22 , text >= 1.2
19 , 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
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
15
12
16executable cookbook-pagination
13executable cookbook-pagination
17 main-is: Pagination.lhs
14 main-is: Pagination.lhs
18 build-tool-depends: markdown-unlit:markdown-unlit
15 build-tool-depends: markdown-unlit:markdown-unlit
19 default-language: Haskell2010
16 default-language: Haskell2010
20 ghc-options: -Wall -pgmL markdown-unlit
17 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
18+ build-depends: base >= 4.8 && <4.12
25− , aeson
19+ , aeson
26− , servant
20+ , servant
27− , servant-server
21+ , servant-server
28− , servant-pagination >= 2.1.0 && < 3.0.0
22+ , servant-pagination >= 2.1.0 && < 3.0.0
29− , warp
23+ , warp
30− else
31− hs-source-dirs: dummy
32− build-depends: base
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-structuring-apis
13executable cookbook-structuring-apis
14 main-is: StructuringApis.lhs
14 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-using-custom-monad
13executable cookbook-using-custom-monad
14 main-is: UsingCustomMonad.lhs
14 main-is: UsingCustomMonad.lhs
doc/cookbook/using-free-client/using-free-client.cabal+2−2
@@ -8,11 +8,11 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-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
12
12
13executable cookbook-using-free-client
13executable cookbook-using-free-client
14 main-is: UsingFreeClient.lhs
14 main-is: UsingFreeClient.lhs
15− build-depends: base == 4.*
15+ build-depends: base >= 4.9 && <5
16 , free
16 , free
17 , servant
17 , servant
18 , servant-client
18 , servant-client
doc/tutorial/tutorial.cabal−2
@@ -13,8 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com
13build-type: Simple
13build-type: Simple
14cabal-version: >=1.10
14cabal-version: >=1.10
15tested-with:
15tested-with:
16− GHC==7.8.4
17− GHC==7.10.3
18 GHC==8.0.2
16 GHC==8.0.2
19 GHC==8.2.2
17 GHC==8.2.2
20 GHC==8.4.3
18 GHC==8.4.3
servant-client-core/servant-client-core.cabal−2
@@ -19,8 +19,6 @@ extra-source-files:
19 CHANGELOG.md
19 CHANGELOG.md
20 README.md
20 README.md
21tested-with:
21tested-with:
22− GHC==7.8.4
23− GHC==7.10.3
24 GHC==8.0.2
22 GHC==8.0.2
25 GHC==8.2.2
23 GHC==8.2.2
26 GHC==8.4.3
24 GHC==8.4.3
servant-client/servant-client.cabal−2
@@ -17,8 +17,6 @@ category: Servant, Web
17build-type: Simple
17build-type: Simple
18cabal-version: >=1.10
18cabal-version: >=1.10
19tested-with:
19tested-with:
20− GHC==7.8.4
21− GHC==7.10.3
22 GHC==8.0.2
20 GHC==8.0.2
23 GHC==8.2.2
21 GHC==8.2.2
24 GHC==8.4.3
22 GHC==8.4.3
servant-docs/servant-docs.cabal−2
@@ -17,8 +17,6 @@ category: Servant, Web
17build-type: Simple
17build-type: Simple
18cabal-version: >=1.10
18cabal-version: >=1.10
19tested-with:
19tested-with:
20− GHC==7.8.4
21− GHC==7.10.3
22 GHC==8.0.2
20 GHC==8.0.2
23 GHC==8.2.2
21 GHC==8.2.2
24 GHC==8.4.3
22 GHC==8.4.3
servant-foreign/servant-foreign.cabal−2
@@ -24,8 +24,6 @@ extra-source-files:
24 README.md
24 README.md
25bug-reports: http://github.com/haskell-servant/servant/issues
25bug-reports: http://github.com/haskell-servant/servant/issues
26tested-with:
26tested-with:
27− GHC==7.8.4
28− GHC==7.10.3
29 GHC==8.0.2
27 GHC==8.0.2
30 GHC==8.2.2
28 GHC==8.2.2
31 GHC==8.4.3
29 GHC==8.4.3
servant-server/servant-server.cabal+1−3
@@ -22,8 +22,6 @@ category: Servant, Web
22build-type: Custom
22build-type: Custom
23cabal-version: >=1.10
23cabal-version: >=1.10
24tested-with:
24tested-with:
25− GHC==7.8.4
26− GHC==7.10.3
27 GHC==8.0.2
25 GHC==8.0.2
28 GHC==8.2.2
26 GHC==8.2.2
29 GHC==8.4.3
27 GHC==8.4.3
@@ -181,7 +179,7 @@ test-suite doctests
181 build-depends:
179 build-depends:
182 base
180 base
183 , servant-server
181 , servant-server
184− , doctest >= 0.15.0 && <0.16
182+ , doctest >= 0.16.0 && <0.17
185 type: exitcode-stdio-1.0
183 type: exitcode-stdio-1.0
186 main-is: test/doctests.hs
184 main-is: test/doctests.hs
187 buildable: True
185 buildable: True
servant/servant.cabal+10−12
@@ -18,8 +18,6 @@ category: Servant, Web
18build-type: Custom
18build-type: Custom
19cabal-version: >=1.10
19cabal-version: >=1.10
20tested-with:
20tested-with:
21− GHC==7.8.4
22− GHC==7.10.3
23 GHC==8.0.2
21 GHC==8.0.2
24 GHC==8.2.2
22 GHC==8.2.2
25 GHC==8.4.3
23 GHC==8.4.3
@@ -74,22 +72,22 @@ library
74 --
72 --
75 -- note: mtl lower bound is so low because of GHC-7.8
73 -- note: mtl lower bound is so low because of GHC-7.8
76 build-depends:
74 build-depends:
77− base >= 4.7 && < 4.12
75+ base >= 4.9 && < 4.12
78− , bytestring >= 0.10.4.0 && < 0.11
76+ , bytestring >= 0.10.8.1 && < 0.11
79 , mtl >= 2.1 && < 2.3
77 , mtl >= 2.1 && < 2.3
80 , text >= 1.2.3.0 && < 1.3
78 , text >= 1.2.3.0 && < 1.3
81
79
82 if !impl(ghc >= 8.0)
80 if !impl(ghc >= 8.0)
83 build-depends:
81 build-depends:
84− semigroups >= 0.18.4 && < 0.19
82+ semigroups >= 0.18.5 && < 0.19
85
83
86 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
84 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
87 -- Here can be exceptions if we really need features from the newer versions.
85 -- Here can be exceptions if we really need features from the newer versions.
88 build-depends:
86 build-depends:
89− base-compat >= 0.10.1 && < 0.11
87+ base-compat >= 0.10.4 && < 0.11
90 , aeson >= 1.3.1.1 && < 1.5
88 , aeson >= 1.3.1.1 && < 1.5
91 , attoparsec >= 0.13.2.2 && < 0.14
89 , 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
93 , http-api-data >= 0.3.8.1 && < 0.4
91 , http-api-data >= 0.3.8.1 && < 0.4
94 , http-media >= 0.7.1.2 && < 0.8
92 , http-media >= 0.7.1.2 && < 0.8
95 , http-types >= 0.12.1 && < 0.13
93 , http-types >= 0.12.1 && < 0.13
@@ -154,23 +152,23 @@ test-suite spec
154
152
155 -- Additonal dependencies
153 -- Additonal dependencies
156 build-depends:
154 build-depends:
157− aeson-compat >= 0.3.7.1 && < 0.4
155+ aeson-compat >= 0.3.8 && < 0.4
158− , hspec >= 2.5.1 && < 2.6
156+ , hspec >= 2.5.4 && < 2.6
159 , QuickCheck >= 2.11.3 && < 2.12
157 , QuickCheck >= 2.11.3 && < 2.12
160 , quickcheck-instances >= 0.3.18 && < 0.4
158 , quickcheck-instances >= 0.3.18 && < 0.4
161
159
162 build-tool-depends:
160 build-tool-depends:
163− hspec-discover:hspec-discover >= 2.5.1 && < 2.6
161+ hspec-discover:hspec-discover >= 2.5.4 && < 2.6
164
162
165test-suite doctests
163test-suite doctests
166 build-depends:
164 build-depends:
167 base
165 base
168 , servant
166 , servant
169− , doctest >= 0.15.0 && <0.16
167+ , doctest >= 0.16.0 && <0.17
170
168
171 -- We test Links failure with doctest, so we need extra dependencies
169 -- We test Links failure with doctest, so we need extra dependencies
172 build-depends:
170 build-depends:
173− hspec >= 2.5.1 && < 2.6
171+ hspec >= 2.5.4 && < 2.6
174
172
175 type: exitcode-stdio-1.0
173 type: exitcode-stdio-1.0
176 main-is: test/doctests.hs
174 main-is: test/doctests.hs
stack.yaml+1−1
@@ -1,5 +1,5 @@
1# Let's try to keep resolver at the first day of the month
1# 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
3packages:
3packages:
4- servant-client/
4- servant-client/
5- servant-client-core/
5- servant-client-core/