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

Add ghc-8.0.1 to travis matrix

commite3c5a78a45f37abf76f5ffac67aa67c02e5c8f0d authorJulian Arni <jkarni@gmail.com> dateTue 10 May 2016, 22:44 (10 years ago) parent1955c5aa5cf899
13 files changed+202−24
compare with master
unifiedsplit
.travis.yml+7−4 servant-client/servant-client.cabal+2 servant-client/test/Servant/ClientSpec.hs+4 servant-docs/servant-docs.cabal+2 servant-foreign/servant-foreign.cabal+2 servant-mock/servant-mock.cabal+1−1 servant-server/servant-server.cabal+6−2 servant-server/src/Servant/Server/Internal/Context.hs+1−1 servant/servant.cabal+3−1 servant/src/Servant/Utils/Links.hs+2−8 servant/test/Servant/Utils/LinksSpec.hs+5−5 stack-ghc-7.8.4.yaml+1−2 stack-ghc-8.0.1.yaml+166
.travis.yml+7−4
@@ -3,8 +3,9 @@ sudo: false
33language: c
44
55env:
6− - GHCVER=7.8.4
7− - GHCVER=7.10.2
6+ - GHCVER=7.8.4 CABALVER=1.22
7+ - GHCVER=7.10.3 CABALVER=1.22
8+ - GHCVER=8.0.1 CABALVER=1.24
89
910addons:
1011 apt:
@@ -12,13 +13,15 @@ addons:
1213 - hvr-ghc
1314 packages:
1415 - ghc-7.8.4
15− - ghc-7.10.2
16+ - ghc-7.10.3
17+ - ghc-8.0.1
1618 - cabal-install-1.22
19+ - cabal-install-1.24
1720 - libgmp-dev
1821
1922install:
2023 - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
21− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
24+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
2225 - ghc --version
2326 - cabal --version
2427 - travis_retry cabal update
servant-client/servant-client.cabal+2
@@ -56,6 +56,8 @@ library
5656 hs-source-dirs: src
5757 default-language: Haskell2010
5858 ghc-options: -Wall
59+ if impl(ghc >= 8.0)
60+ ghc-options: -Wno-redundant-constraints
5961 include-dirs: include
6062
6163test-suite spec
servant-client/test/Servant/ClientSpec.hs+4
@@ -15,7 +15,11 @@
1515{-# LANGUAGE TypeFamilies #-}
1616{-# LANGUAGE TypeOperators #-}
1717{-# LANGUAGE UndecidableInstances #-}
18+#if __GLASGOW_HASKELL__ >= 800
19+{-# OPTIONS_GHC -freduction-depth=100 #-}
20+#else
1821{-# OPTIONS_GHC -fcontext-stack=100 #-}
22+#endif
1923{-# OPTIONS_GHC -fno-warn-orphans #-}
2024{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
2125
servant-docs/servant-docs.cabal+2
@@ -50,6 +50,8 @@ library
5050 hs-source-dirs: src
5151 default-language: Haskell2010
5252 ghc-options: -Wall
53+ if impl(ghc >= 8.0)
54+ ghc-options: -Wno-redundant-constraints
5355 include-dirs: include
5456
5557executable greet-docs
servant-foreign/servant-foreign.cabal+2
@@ -37,6 +37,8 @@ library
3737 hs-source-dirs: src
3838 default-language: Haskell2010
3939 ghc-options: -Wall
40+ if impl(ghc >= 8.0)
41+ ghc-options: -Wno-redundant-constraints
4042 include-dirs: include
4143 default-extensions: CPP
4244 , ConstraintKinds
servant-mock/servant-mock.cabal+1−1
@@ -29,7 +29,7 @@ library
2929 http-types >= 0.8 && <0.10,
3030 servant == 0.7.*,
3131 servant-server == 0.7.*,
32− transformers >= 0.3 && <0.5,
32+ transformers >= 0.3 && <0.6,
3333 QuickCheck >= 2.7 && <2.9,
3434 wai >= 3.0 && <3.3
3535 hs-source-dirs: src
servant-server/servant-server.cabal+6−2
@@ -74,6 +74,8 @@ library
7474 hs-source-dirs: src
7575 default-language: Haskell2010
7676 ghc-options: -Wall
77+ if impl(ghc >= 8.0)
78+ ghc-options: -Wno-redundant-constraints
7779 include-dirs: include
7880
7981executable greet
@@ -99,9 +101,11 @@ test-suite spec
99101 other-modules:
100102 Servant.Server.ErrorSpec
101103 Servant.Server.Internal.ContextSpec
102− Servant.ServerSpec
104+ Servant.Server.RouterSpec
105+ Servant.Server.StreamingSpec
103106 Servant.Server.UsingContextSpec
104107 Servant.Server.UsingContextSpec.TestCombinators
108+ Servant.ServerSpec
105109 Servant.Utils.StaticFilesSpec
106110 build-depends:
107111 base == 4.*
@@ -122,7 +126,7 @@ test-suite spec
122126 , servant
123127 , servant-server
124128 , string-conversions
125− , should-not-typecheck == 2.*
129+ , should-not-typecheck == 2.1.*
126130 , temporary
127131 , text
128132 , transformers
servant-server/src/Servant/Server/Internal/Context.hs+1−1
@@ -59,7 +59,7 @@ instance (Eq a, Eq (Context as)) => Eq (Context (a ': as)) where
5959--
6060-- >>> getContextEntry (True :. False :. EmptyContext) :: String
6161-- ...
62−-- No instance for (HasContextEntry '[] [Char])
62+-- ...No instance for (HasContextEntry '[] [Char])
6363-- ...
6464class HasContextEntry (context :: [*]) (val :: *) where
6565 getContextEntry :: Context context -> val
servant/servant.cabal+3−1
@@ -49,7 +49,7 @@ library
4949 Servant.Utils.Links
5050 Servant.Utils.Enter
5151 build-depends:
52− base >= 4.7 && < 4.9
52+ base >= 4.7 && < 4.10
5353 , base-compat >= 0.9
5454 , aeson >= 0.7
5555 , attoparsec >= 0.12
@@ -88,6 +88,8 @@ library
8888 , TypeSynonymInstances
8989 , UndecidableInstances
9090 ghc-options: -Wall
91+ if impl(ghc >= 8.0)
92+ ghc-options: -Wno-redundant-constraints
9193 include-dirs: include
9294
9395test-suite spec
servant/src/Servant/Utils/Links.hs+2−8
@@ -72,14 +72,8 @@
7272-- >>> let bad_link = Proxy :: Proxy ("hello" :> Delete '[JSON] ())
7373-- >>> safeLink api bad_link
7474-- ...
75−-- Could not deduce (Or
76−-- (IsElem' (Verb 'DELETE 200 '[JSON] ()) (Verb 'GET 200 '[JSON] Int))
77−-- (IsElem'
78−-- ("hello" :> Delete '[JSON] ())
79−-- ("bye" :> (QueryParam "name" String :> Delete '[JSON] ()))))
80−-- arising from a use of ‘safeLink’
81−-- In the expression: safeLink api bad_link
82−-- In an equation for ‘it’: it = safeLink api bad_link
75+-- ...Could not deduce...
76+-- ...
8377--
8478-- This error is essentially saying that the type family couldn't find
8579-- bad_link under api after trying the open (but empty) type family
servant/test/Servant/Utils/LinksSpec.hs+5−5
@@ -67,27 +67,27 @@ spec = describe "Servant.Utils.Links" $ do
6767--
6868-- >>> apiLink (Proxy :: Proxy WrongPath)
6969-- ...
70−-- Could not deduce ...
70+-- ...Could not deduce...
7171-- ...
7272--
7373-- >>> apiLink (Proxy :: Proxy WrongReturnType)
7474-- ...
75−-- Could not deduce ...
75+-- ...Could not deduce...
7676-- ...
7777--
7878-- >>> apiLink (Proxy :: Proxy WrongContentType)
7979-- ...
80−-- Could not deduce ...
80+-- ...Could not deduce...
8181-- ...
8282--
8383-- >>> apiLink (Proxy :: Proxy WrongMethod)
8484-- ...
85−-- Could not deduce ...
85+-- ...Could not deduce...
8686-- ...
8787--
8888-- >>> apiLink (Proxy :: Proxy NotALink)
8989-- ...
90−-- Could not deduce ...
90+-- ...Could not deduce...
9191-- ...
9292--
9393-- sanity check
stack-ghc-7.8.4.yaml+1−2
@@ -5,7 +5,6 @@ packages:
55- servant-cassava/
66- servant-client/
77- servant-docs/
8−- servant-examples/
98- servant-foreign/
109- servant-js/
1110- servant-lucid/
@@ -24,5 +23,5 @@ extra-deps:
2423- stm-delay-0.1.1.1
2524- control-monad-omega-0.3.1
2625- http-api-data-0.1.1.1
27−- should-not-typecheck-2.0.1
26+- should-not-typecheck-2.1.0
2827resolver: lts-2.22
stack-ghc-8.0.1.yamlnew file+166
@@ -0,0 +1,166 @@
1+flags:
2+ time-locale-compat:
3+ old-locale: false
4+packages:
5+- servant/
6+- servant-blaze/
7+- servant-cassava/
8+- servant-client/
9+- servant-docs/
10+- servant-foreign/
11+- servant-js/
12+- servant-lucid/
13+- servant-mock/
14+- servant-server/
15+setup-info:
16+ ghc:
17+ linux64:
18+ 8.0.0.20160421:
19+ url: https://downloads.haskell.org/~ghc/8.0.1-rc4/ghc-8.0.0.20160421-x86_64-unknown-linux.tar.xz
20+ macosx:
21+ 8.0.0.20160421:
22+ url: https://downloads.haskell.org/~ghc/8.0.1-rc4/ghc-8.0.0.20160421-x86_64-apple-darwin.tar.xz
23+extra-deps:
24+- Diff-0.3.4
25+- HUnit-1.3.1.1
26+- QuickCheck-2.8.2
27+- StateVar-1.1.0.4
28+- adjunctions-4.3
29+- aeson-0.11.2.0
30+- aeson-pretty-0.7.2
31+- ansi-terminal-0.6.2.3
32+- ansi-wl-pprint-0.6.7.3
33+- appar-0.1.4
34+- asn1-encoding-0.9.3
35+- asn1-parse-0.9.4
36+- asn1-types-0.3.2
37+- async-2.1.0
38+- attoparsec-0.13.0.2
39+- auto-update-0.1.4
40+- base-compat-0.9.1
41+- base-orphans-0.5.4
42+- base64-bytestring-1.0.0.1
43+- bifunctors-5.3
44+- blaze-builder-0.4.0.2
45+- blaze-html-0.8.1.1
46+- blaze-markup-0.7.0.3
47+- byteable-0.1.1
48+- byteorder-1.0.4
49+- bytestring-builder-0.10.6.0.0
50+- bytestring-conversion-0.3.1
51+- case-insensitive-1.2.0.6
52+- cassava-0.4.5.0
53+- cereal-0.5.1.0
54+- charset-0.3.7.1
55+- cmdargs-0.10.14
56+- comonad-5
57+- connection-0.2.5
58+- contravariant-1.4
59+- control-monad-omega-0.3.1
60+- cookie-0.4.2
61+- cryptonite-0.15
62+- data-default-class-0.0.1
63+- distributive-0.5.0.2
64+- dlist-0.7.1.2
65+- doctest-0.11.0
66+- double-conversion-2.0.1.0
67+- easy-file-0.2.1
68+- exceptions-0.8.2.1
69+- fail-4.9.0.0
70+- fast-logger-2.4.6
71+- file-embed-0.0.10
72+- filemanip-0.3.6.3
73+- free-4.12.4
74+- ghc-paths-0.1.0.9
75+- hashable-1.2.4.0
76+- hex-0.1.2
77+- hourglass-0.2.10
78+- hspec-2.2.3
79+- hspec-core-2.2.3
80+- hspec-discover-2.2.3
81+- hspec-expectations-0.7.2
82+- hspec-wai-0.6.6
83+- http-api-data-0.2.2
84+- http-client-0.4.28
85+- http-client-tls-0.2.4
86+- http-date-0.0.6.1
87+- http-media-0.6.3
88+- http-types-0.9
89+- http2-1.6.0
90+- iproute-1.7.0
91+- kan-extensions-5.0.1
92+- language-ecmascript-0.17.1.0
93+- lens-4.14
94+- lifted-base-0.2.3.6
95+- lucid-2.9.5
96+- memory-0.12
97+- mime-types-0.1.0.7
98+- mmorph-1.0.6
99+- monad-control-1.0.1.0
100+- mtl-2.2.1
101+- network-2.6.2.1
102+- network-uri-2.6.1.0
103+- old-locale-1.0.0.7
104+- old-time-1.1.0.3
105+- optparse-applicative-0.12.1.0
106+- parallel-3.2.1.0
107+- parsec-3.1.9
108+- pem-0.2.2
109+- prelude-extras-0.4.0.3
110+- primitive-0.6.1.0
111+- profunctors-5.2
112+- psqueues-0.2.2.1
113+- quickcheck-instances-0.3.12
114+- quickcheck-io-0.1.2
115+- random-1.1
116+- reflection-2.1.2
117+- resourcet-1.1.7.4
118+- safe-0.3.9
119+- scientific-0.3.4.6
120+- semigroupoids-5.0.1
121+- semigroups-0.18.1
122+- setenv-0.1.1.3
123+- should-not-typecheck-2.1.0
124+- simple-sendfile-0.2.21
125+- socks-0.5.5
126+- split-0.2.3.1
127+- stm-2.4.4.1
128+- streaming-commons-0.1.15.4
129+- string-conversions-0.4
130+- stringsearch-0.3.6.6
131+- syb-0.6
132+- system-filepath-0.4.13.4
133+- tagged-0.8.4
134+- tagshare-0.0
135+- temporary-1.2.0.4
136+- testing-feat-0.4.0.3
137+- text-1.2.2.1
138+- tf-random-0.5
139+- time-locale-compat-0.1.1.1
140+- tls-1.3.7
141+- transformers-base-0.4.4
142+- transformers-compat-0.5.1.4
143+- uniplate-1.6.12
144+- unix-compat-0.4.1.4
145+- unix-time-0.3.6
146+- unordered-containers-0.2.7.0
147+- url-2.1.3
148+- utf8-string-1.0.1.1
149+- vault-0.3.0.6
150+- vector-0.11.0.0
151+- void-0.7.1
152+- wai-3.2.1
153+- wai-app-static-3.1.5
154+- wai-extra-3.0.15.1
155+- wai-logger-2.2.7
156+- warp-3.2.6
157+- with-location-0.1.0
158+- wl-pprint-1.2
159+- word8-0.1.2
160+- x509-1.6.3
161+- x509-store-1.6.1
162+- x509-system-1.6.3
163+- x509-validation-1.6.3
164+- zlib-0.6.1.1
165+compiler-check: match-exact
166+resolver: ghc-8.0.0.20160421