Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 9.0.2 to the CI matrix, complete migration to 9.2 #232

Merged
merged 4 commits into from
Feb 3, 2022
Merged

Add 9.0.2 to the CI matrix, complete migration to 9.2 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61c6fe7
Add 9.2 to the CI matrix
swamp-agr Feb 3, 2022
78bbca2
Enable `PolyKinds`, make kinds explicit in `Data.Swagger.Internal`
swamp-agr Feb 3, 2022
5b05a41
Enable tests on 9.0.2, make it latest (stable)
swamp-agr Feb 3, 2022
86e8dc1
Remove 9.2 from Matrix
swamp-agr Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
ghc: ["8.6.5", "8.8.4", "8.10.4", "8.10.7"]
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
cabal: ["3.6.2.0"]
os: [ubuntu-latest, macOS-latest]
name: build and test (cabal)
Expand All @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v2
- uses: haskell/actions/setup@v1
with:
ghc-version: "8.10.7"
ghc-version: "9.0.2"
enable-stack: true
stack-version: "latest"
- run: |
Expand Down
9 changes: 5 additions & 4 deletions src/Data/Swagger/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE DeriveGeneric #-}
Expand Down Expand Up @@ -363,7 +364,7 @@ data ParamOtherSchema = ParamOtherSchema
-- @'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
Expand Down Expand Up @@ -422,7 +423,7 @@ instance Data (SwaggerItems 'SwaggerKindSchema) where
dataTypeOf _ = swaggerItemsDataType

-- | Type used as a kind to avoid overlapping instances.
data SwaggerKind t
data SwaggerKind (t :: *)
= SwaggerKindNormal t
| SwaggerKindParamOtherSchema
| SwaggerKindSchema
Expand All @@ -437,7 +438,7 @@ 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
Expand Down Expand Up @@ -508,7 +509,7 @@ data ParamLocation
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@.
Expand Down