git.iko.soy/typeable/openapi3
on master help sign in
Merge pull request #166 from phadej/ghc-8.6

Support ghc-8.6

commit84cd47ed2405ceb453416fd519c0e6a0a89099c3 authorNickolay Kudasov <fizruk@users.noreply.github.com> dateTue 9 Oct 2018, 22:35 (8 years ago) parentf42c345647ba3f
8 files changed+91−35
compare with master
unifiedsplit
.travis.yml+11−8 stack.yaml+3−4 swagger2.cabal+28−19 test/Data/Aeson/QQ/Simple.hs+45 test/Data/Swagger/CommonTestTypes.hs+1−1 test/Data/Swagger/ParamSchemaSpec.hs+1−1 test/Data/Swagger/SchemaSpec.hs+1−1 test/Data/SwaggerSpec.hs+1−1
.travis.yml+11−8
@@ -2,7 +2,7 @@
22#
33# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' 'swagger2.cabal' '--env=8.2.2:HADDOCK=false' '--env=8.0.2:HADDOCK=false' '--env=7.10.3:HADDOCK=false' '--env=7.8.4:HADDOCK=false'
44#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
88sudo: false
@@ -32,21 +32,24 @@ before_cache:
3232
3333matrix:
3434 include:
35+ - compiler: "ghc-8.6.1"
36+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3538 - compiler: "ghc-8.4.3"
3639 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
3841 - compiler: "ghc-8.2.2"
3942 env: HADDOCK=false
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4144 - compiler: "ghc-8.0.2"
4245 env: HADDOCK=false
43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4447 - compiler: "ghc-7.10.3"
4548 env: HADDOCK=false
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4750 - compiler: "ghc-7.8.4"
4851 env: HADDOCK=false
49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
52+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
5053
5154before_install:
5255 - HC=${CC}
@@ -73,7 +76,7 @@ install:
7376 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7477 - "printf 'packages: \".\"\\n' > cabal.project"
7578 - touch cabal.project.local
76− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
79+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- swagger2 | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7780 - cat cabal.project || true
7881 - cat cabal.project.local || true
7982 - if [ -f "./configure.ac" ]; then
@@ -95,7 +98,7 @@ script:
9598 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
9699 - "printf 'packages: swagger2-*/*.cabal\\n' > cabal.project"
97100 - touch cabal.project.local
98− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
101+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- swagger2 | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
99102 - cat cabal.project || true
100103 - cat cabal.project.local || true
101104 # this builds all libraries and executables (without tests/benchmarks)
stack.yaml+3−4
@@ -1,7 +1,6 @@
1−resolver: lts-11.14
1+resolver: lts-12.10
22packages:
33- '.'
44extra-deps:
5−- aeson-1.3.1.0
6−- base-compat-0.10.1
7−- base-compat-batteries-0.10.1
5+- base-compat-batteries-0.10.4
6+- contravariant-1.5
swagger2.cabal+28−19
@@ -1,8 +1,9 @@
11cabal-version: >=1.10
22name: swagger2
3−version: 2.3
3+version: 2.3.0.1
44
55synopsis: Swagger 2.0 data model
6+category: Web, Swagger
67description:
78 This library is inteded to be used for decoding and encoding Swagger 2.0 API
89 specifications as well as manipulating them.
@@ -16,14 +17,19 @@ license-file: LICENSE
1617author: Nickolay Kudasov
1718maintainer: nickolay@getshoptv.com
1819copyright: (c) 2015-2016, GetShopTV
19−category: Web, Swagger
2020build-type: Custom
2121extra-source-files:
2222 README.md
2323 , CHANGELOG.md
2424 , examples/*.hs
2525 , include/overlapping-compat.h
26−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
26+tested-with:
27+ GHC ==7.8.4
28+ || ==7.10.3
29+ || ==8.0.2
30+ || ==8.2.2
31+ || ==8.4.3
32+ || ==8.6.1
2733
2834custom-setup
2935 setup-depends:
@@ -53,12 +59,12 @@ library
5359
5460 -- GHC boot libraries
5561 build-depends:
56− base >=4.7 && <4.12
57− , bytestring >=0.10.4 && <0.11
58− , containers >=0.5.5.1 && <0.6
59− , template-haskell >=2.9.0.0 && <2.14
60− , time >=1.4.2 && <1.9
61− , transformers >=0.3.0.0 && <0.6
62+ base >=4.7 && <4.13
63+ , bytestring >=0.10.4.0 && <0.11
64+ , containers >=0.5.5.1 && <0.7
65+ , template-haskell >=2.9.0.0 && <2.15
66+ , time >=1.4.2 && <1.9
67+ , transformers >=0.3.0.0 && <0.6
6268
6369 build-depends:
6470 mtl >=2.1 && <2.3
@@ -66,18 +72,18 @@ library
6672
6773 -- other dependencies
6874 build-depends:
69− base-compat-batteries >=0.10.1 && <0.11
70− , aeson >=1.0.0.0 && <1.5
75+ base-compat-batteries >=0.10.4 && <0.11
76+ , aeson >=1.3.1.1 && <1.5
7177 , generics-sop >=0.3.2.0 && <0.4
7278 , hashable >=1.2.7.0 && <1.3
7379 , http-media >=0.7.1.2 && <0.8
74− , insert-ordered-containers >=0.1.0.0 && <0.3
80+ , insert-ordered-containers >=0.2.1.0 && <0.3
7581 , lens >=4.16.1 && <4.18
7682 , network >=2.6.3.5 && <2.8
77− , scientific >=0.3.5.3 && <0.4
83+ , scientific >=0.3.6.2 && <0.4
7884 , transformers-compat >=0.3 && <0.7
7985 , unordered-containers >=0.2.9.0 && <0.3
80− , uuid-types >=1.0.2 && <1.1
86+ , uuid-types >=1.0.3 && <1.1
8187 , vector >=0.12.0.1 && <0.13
8288
8389 default-language: Haskell2010
@@ -100,6 +106,7 @@ test-suite spec
100106 , insert-ordered-containers
101107 , lens
102108 , mtl
109+ , template-haskell
103110 , text
104111 , time
105112 , unordered-containers
@@ -107,15 +114,15 @@ test-suite spec
107114
108115 -- test-suite only dependencies
109116 build-depends:
110− aeson-qq >=0.8.2 && <0.9
111− , hspec >=2.4.8 && <2.6
117+ hspec >=2.5.5 && <2.6
112118 , HUnit >=1.6.0.0 && <1.7
113− , QuickCheck >=2.10.1 && <2.12
114− , quickcheck-instances >=0.3.18 && <0.14
119+ , QuickCheck >=2.11.3 && <2.12
120+ , quickcheck-instances >=0.3.19 && <0.14
121+ , utf8-string >=1.0.1.1 && <1.1
115122
116123 -- https://github.com/haskell/cabal/issues/3708
117124 build-tool-depends:
118− hspec-discover:hspec-discover >=2.4.8 && <2.6
125+ hspec-discover:hspec-discover >=2.5.5 && <2.6
119126
120127 other-modules:
121128 SpecCommon
@@ -124,6 +131,8 @@ test-suite spec
124131 Data.Swagger.ParamSchemaSpec
125132 Data.Swagger.SchemaSpec
126133 Data.Swagger.Schema.ValidationSpec
134+
135+ Data.Aeson.QQ.Simple
127136 default-language: Haskell2010
128137
129138test-suite doctests
test/Data/Aeson/QQ/Simple.hsnew file+45
@@ -0,0 +1,45 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+-- | Like "Data.Aeson.QQ" but without interpolation.
3+module Data.Aeson.QQ.Simple where
4+
5+import Data.Aeson
6+import Data.ByteString.Lazy.UTF8 as UTF8
7+import qualified Data.HashMap.Strict as HM
8+import qualified Data.Text as T
9+import qualified Data.Vector as V
10+import Language.Haskell.TH
11+import Language.Haskell.TH.Quote
12+import Language.Haskell.TH.Syntax (Lift (..))
13+import Prelude ()
14+import Prelude.Compat
15+
16+aesonQQ :: QuasiQuoter
17+aesonQQ = QuasiQuoter
18+ { quoteExp = aesonExp
19+ , quotePat = const $ error "No quotePat defined for jsonQQ"
20+ , quoteType = const $ error "No quoteType defined for jsonQQ"
21+ , quoteDec = const $ error "No quoteDec defined for jsonQQ"
22+ }
23+
24+aesonExp :: String -> ExpQ
25+aesonExp txt =
26+ case eitherDecode $ UTF8.fromString txt of
27+ Left err -> error $ "Error in aesonExp: " ++ show err
28+ Right val -> liftValue val
29+
30+liftValue :: Value -> ExpQ
31+liftValue (String str) = [| String $(liftText str) |]
32+liftValue Null = [| Null |]
33+liftValue (Number n) = [| Number (fromRational $(return $ LitE $ RationalL (toRational n))) |]
34+liftValue (Bool b) = [| Bool b |]
35+liftValue (Array arr) = [| Array $ V.fromList $(ListE <$> traverse liftValue (V.toList arr)) |]
36+liftValue (Object obj) = [| object $jsList |]
37+ where
38+ jsList :: ExpQ
39+ jsList = ListE <$> traverse objs2list (HM.toList obj)
40+
41+ objs2list :: (T.Text, Value) -> ExpQ
42+ objs2list (key, value) = [| ($(liftText key), $(liftValue value)) |]
43+
44+liftText :: T.Text -> ExpQ
45+liftText t = [| T.pack $(lift $ T.unpack t) |]
test/Data/Swagger/CommonTestTypes.hs+1−1
@@ -8,7 +8,7 @@ import Prelude ()
88import Prelude.Compat
99
1010import Data.Aeson (ToJSON (..), ToJSONKey (..), Value)
11−import Data.Aeson.QQ
11+import Data.Aeson.QQ.Simple
1212import Data.Aeson.Types (toJSONKeyText)
1313import Data.Char
1414import Data.Map (Map)
test/Data/Swagger/ParamSchemaSpec.hs+1−1
@@ -6,7 +6,7 @@
66module Data.Swagger.ParamSchemaSpec where
77
88import Data.Aeson (Value)
9−import Data.Aeson.QQ
9+import Data.Aeson.QQ.Simple
1010import Data.Char
1111import Data.Proxy
1212import GHC.Generics
test/Data/Swagger/SchemaSpec.hs+1−1
@@ -10,7 +10,7 @@ import Prelude.Compat
1010import Control.Lens ((^.))
1111import Data.Aeson (Value, ToJSON(..), ToJSONKey(..))
1212import Data.Aeson.Types (toJSONKeyText)
13−import Data.Aeson.QQ
13+import Data.Aeson.QQ.Simple
1414import Data.Char
1515import qualified Data.HashMap.Strict.InsOrd as InsOrdHashMap
1616import Data.Proxy
test/Data/SwaggerSpec.hs+1−1
@@ -10,7 +10,7 @@ import Prelude.Compat
1010import Control.Lens
1111
1212import Data.Aeson
13−import Data.Aeson.QQ
13+import Data.Aeson.QQ.Simple
1414import Data.HashMap.Strict (HashMap)
1515import qualified Data.Set as Set
1616import Data.Text (Text)