git.iko.soy/typeable/openapi3
on master help sign in
Relax lower version bounds for some packages
b2f1e40Uladzimir Stsepchanka
openapi3.cabal+4−4
@@ -66,18 +66,18 @@ library
66
66
67 build-depends:
67 build-depends:
68 mtl >=2.2.2 && <2.3
68 mtl >=2.2.2 && <2.3
69− , text >=1.2.3.1 && <1.3
69+ , text >=1.2.3.0 && <1.3
70
70
71 -- other dependencies
71 -- other dependencies
72 build-depends:
72 build-depends:
73− base-compat-batteries >=0.11.1 && <0.12
73+ base-compat-batteries >=0.10.5 && <0.12
74 , aeson >=1.4.2.0 && <1.6
74 , aeson >=1.4.2.0 && <1.6
75 , aeson-pretty >=0.8.7 && <0.9
75 , aeson-pretty >=0.8.7 && <0.9
76 -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint
76 -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint
77 , cookie >=0.4.3 && <0.5
77 , cookie >=0.4.3 && <0.5
78− , generics-sop >=0.5.1.0 && <0.6
78+ , generics-sop >=0.4.0.1 && <0.6
79 , hashable >=1.2.7.0 && <1.4
79 , hashable >=1.2.7.0 && <1.4
80− , http-media >=0.8.0.0 && <0.9
80+ , http-media >=0.7.1.3 && <0.9
81 , insert-ordered-containers >=0.2.3 && <0.3
81 , insert-ordered-containers >=0.2.3 && <0.3
82 , lens >=4.16.1 && <4.20
82 , lens >=4.16.1 && <4.20
83 , network >=2.6.3.5 && <3.2
83 , network >=2.6.3.5 && <3.2
src/Data/OpenApi/Internal/AesonUtils.hs+28−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE GADTs #-}
4{-# LANGUAGE GADTs #-}
@@ -137,7 +138,15 @@ sopSwaggerGenericToJSON'
137 -> DatatypeInfo '[xs]
138 -> DatatypeInfo '[xs]
138 -> POP Maybe '[xs]
139 -> POP Maybe '[xs]
139 -> [Pair]
140 -> [Pair]
141+sopSwaggerGenericToJSON'
142+ opts
143+ (SOP (Z fields))
144+#if MIN_VERSION_generics_sop(0,5,0)
140−sopSwaggerGenericToJSON' opts (SOP (Z fields)) (ADT _ _ (Record _ fieldsInfo :* Nil) _) (POP (defs :* Nil)) =
145+ (ADT _ _ (Record _ fieldsInfo :* Nil) _)
146+#else
147+ (ADT _ _ (Record _ fieldsInfo :* Nil))
148+#endif
149+ (POP (defs :* Nil)) =
141 sopSwaggerGenericToJSON'' opts fields fieldsInfo defs
150 sopSwaggerGenericToJSON'' opts fields fieldsInfo defs
142sopSwaggerGenericToJSON' _ _ _ _ = error "sopSwaggerGenericToJSON: unsupported type"
151sopSwaggerGenericToJSON' _ _ _ _ = error "sopSwaggerGenericToJSON: unsupported type"
143
152
@@ -210,7 +219,15 @@ sopSwaggerGenericParseJSON'
210 -> DatatypeInfo '[xs]
219 -> DatatypeInfo '[xs]
211 -> POP Maybe '[xs]
220 -> POP Maybe '[xs]
212 -> Parser (SOP I '[xs])
221 -> Parser (SOP I '[xs])
213−sopSwaggerGenericParseJSON' opts obj (ADT _ _ (Record _ fieldsInfo :* Nil) _) (POP (defs :* Nil)) =
222+sopSwaggerGenericParseJSON'
223+ opts
224+ obj
225+#if MIN_VERSION_generics_sop(0,5,0)
226+ (ADT _ _ (Record _ fieldsInfo :* Nil) _)
227+#else
228+ (ADT _ _ (Record _ fieldsInfo :* Nil))
229+#endif
230+ (POP (defs :* Nil)) =
214 SOP . Z <$> sopSwaggerGenericParseJSON'' opts obj fieldsInfo defs
231 SOP . Z <$> sopSwaggerGenericParseJSON'' opts obj fieldsInfo defs
215sopSwaggerGenericParseJSON' _ _ _ _ = error "sopSwaggerGenericParseJSON: unsupported type"
232sopSwaggerGenericParseJSON' _ _ _ _ = error "sopSwaggerGenericParseJSON: unsupported type"
216
233
@@ -277,7 +294,15 @@ sopSwaggerGenericToEncoding'
277 -> DatatypeInfo '[xs]
294 -> DatatypeInfo '[xs]
278 -> POP Maybe '[xs]
295 -> POP Maybe '[xs]
279 -> Series
296 -> Series
280−sopSwaggerGenericToEncoding' opts (SOP (Z fields)) (ADT _ _ (Record _ fieldsInfo :* Nil) _) (POP (defs :* Nil)) =
297+sopSwaggerGenericToEncoding'
298+ opts
299+ (SOP (Z fields))
300+#if MIN_VERSION_generics_sop(0,5,0)
301+ (ADT _ _ (Record _ fieldsInfo :* Nil) _)
302+#else
303+ (ADT _ _ (Record _ fieldsInfo :* Nil))
304+#endif
305+ (POP (defs :* Nil)) =
281 sopSwaggerGenericToEncoding'' opts fields fieldsInfo defs
306 sopSwaggerGenericToEncoding'' opts fields fieldsInfo defs
282sopSwaggerGenericToEncoding' _ _ _ _ = error "sopSwaggerGenericToEncoding: unsupported type"
307sopSwaggerGenericToEncoding' _ _ _ _ = error "sopSwaggerGenericToEncoding: unsupported type"
283
308