swagger2 2.7 → 2.8

raw patch · 4 files changed

+22/−18 lines, 4 filesdep ~basedep ~base-compat-batteriesdep ~bytestringPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, base-compat-batteries, bytestring, hashable, lens, template-haskell, time

API changes (from Hackage documentation)

Files

• CHANGELOG.md +6/−0
• src/Data/Swagger/Internal.hs +5/−10
• swagger2.cabal +8/−8
• test/Data/Swagger/Schema/ValidationSpec.hs +3/−0

@@ -1,3 +1,9 @@+2.8+---++- Support GHC 9.2 (see [#231](https://github.com/GetShopTV/swagger2/pull/231), [#232](https://github.com/GetShopTV/swagger2/pull/232), [#233](https://github.com/GetShopTV/swagger2/pull/233));+- Aeson `2.0.3.0` compatibility (see [#230]( https://github.com/GetShopTV/swagger2/pull/230 ));+ 2.7 --- 

@@ -1,4 +1,5 @@ {-# LANGUAGE DataKinds #-}+{-# LANGUAGE PolyKinds #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveGeneric #-}@@ -363,7 +364,7 @@ -- @'SwaggerItemsObject'@ should be used to specify homogenous array @'Schema'@s. -- -- @'SwaggerItemsArray'@ should be used to specify tuple @'Schema'@s.-data SwaggerItems t where+data SwaggerItems (t :: SwaggerKind *) where   SwaggerItemsPrimitive :: Maybe (CollectionFormat k) -> ParamSchema k-> SwaggerItems k   SwaggerItemsObject    :: Referenced Schema   -> SwaggerItems 'SwaggerKindSchema   SwaggerItemsArray     :: [Referenced Schema] -> SwaggerItems 'SwaggerKindSchema@@ -371,7 +372,6 @@  deriving instance Eq (SwaggerItems t) deriving instance Show (SwaggerItems t)---deriving instance Typeable (SwaggerItems t)  swaggerItemsPrimitiveConstr :: Constr swaggerItemsPrimitiveConstr = mkConstr swaggerItemsDataType "SwaggerItemsPrimitive" [] Prefix@@ -422,22 +422,17 @@   dataTypeOf _ = swaggerItemsDataType  -- | Type used as a kind to avoid overlapping instances.-data SwaggerKind t+data SwaggerKind (t :: *)     = SwaggerKindNormal t     | SwaggerKindParamOtherSchema     | SwaggerKindSchema-    deriving (Typeable) -deriving instance Typeable 'SwaggerKindNormal-deriving instance Typeable 'SwaggerKindParamOtherSchema-deriving instance Typeable 'SwaggerKindSchema- type family SwaggerKindType (k :: SwaggerKind *) :: * type instance SwaggerKindType ('SwaggerKindNormal t) = t type instance SwaggerKindType 'SwaggerKindSchema = Schema type instance SwaggerKindType 'SwaggerKindParamOtherSchema = ParamOtherSchema -data SwaggerType t where+data SwaggerType (t :: SwaggerKind *) where   SwaggerString   :: SwaggerType t   SwaggerNumber   :: SwaggerType t   SwaggerInteger  :: SwaggerType t@@ -508,7 +503,7 @@ type Format = Text  -- | Determines the format of the array.-data CollectionFormat t where+data CollectionFormat (t :: SwaggerKind *) where   -- Comma separated values: @foo,bar@.   CollectionCSV :: CollectionFormat t   -- Space separated values: @foo bar@.

@@ -1,6 +1,6 @@ cabal-version:       >=1.10 name:                swagger2-version:             2.7+version:             2.8  synopsis:            Swagger 2.0 data model category:            Web, Swagger@@ -59,11 +59,11 @@    -- GHC boot libraries   build-depends:-      base             >=4.9       && <4.16-    , bytestring       >=0.10.8.1  && <0.11+      base             >=4.9       && <4.17+    , bytestring       >=0.10.8.1  && <0.12     , containers       >=0.5.7.1   && <0.7-    , template-haskell >=2.11.1.0  && <2.18-    , time             >=1.6.0.1   && <1.10+    , template-haskell >=2.11.1.0  && <2.19+    , time             >=1.6.0.1   && <1.14     , transformers     >=0.5.2.0   && <0.6    build-depends:@@ -72,16 +72,16 @@    -- other dependencies   build-depends:-      base-compat-batteries     >=0.11.1   && <0.12+      base-compat-batteries     >=0.11.1   && <0.13     , aeson                     >=2.0.0.0  && <2.1     , aeson-pretty              >=0.8.7    && <0.9     -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint     , cookie                    >=0.4.3    && <0.5     , generics-sop              >=0.5.1.0  && <0.6-    , hashable                  >=1.2.7.0  && <1.4+    , hashable                  >=1.2.7.0  && <1.5     , http-media                >=0.8.0.0  && <0.9     , insert-ordered-containers >=0.2.3    && <0.3-    , lens                      >=4.16.1   && <5.1+    , lens                      >=4.16.1   && <5.2     , network                   >=2.6.3.5  && <3.2     , optics-core               >=0.2      && <0.5     , optics-th                 >=0.2      && <0.5

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP                 #-} {-# LANGUAGE DeriveGeneric       #-} {-# LANGUAGE PackageImports      #-} {-# LANGUAGE RecordWildCards     #-}@@ -268,6 +269,7 @@ -- Arbitrary instance for Data.Aeson.Value -- ======================================================================== +#if !MIN_VERSION_aeson(2,0,3) instance Arbitrary Value where   -- Weights are almost random   -- Uniform oneof tends not to build complex objects cause of recursive call.@@ -281,3 +283,4 @@  instance Arbitrary (KM.KeyMap Value) where   arbitrary = KM.fromHashMapText <$> arbitrary+#endif