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.

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

Bump deps and fix doctest for GHC 9.10 #255

Merged
merged 4 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1"]
cabal: ["3.10.2.0"]
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.5", "9.8.2", "9.10.1"]
cabal: ["3.12.1.0"]
os: [ubuntu-latest, macOS-latest]
fail-fast: false
name: build and test (cabal)
Expand Down
1 change: 0 additions & 1 deletion src/Data/Swagger.hs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ import Data.Swagger.Internal
-- ... that matches aeson's Generic-based toJSON,
-- ... but that's not supported by some Swagger tools.
-- ...
-- ... In the instance declaration for ‘ToSchema BadMixedType’
--
-- We can use 'genericDeclareNamedSchemaUnrestricted' to try our best to represent this type as a Swagger Schema and match 'ToJSON':
--
Expand Down
22 changes: 11 additions & 11 deletions swagger2.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ tested-with:

custom-setup
setup-depends:
base < 4.20
, Cabal < 3.11
base < 4.21
, Cabal < 3.13
, cabal-doctest >=1.0.6 && <1.1

library
Expand Down Expand Up @@ -62,10 +62,10 @@ library

-- GHC boot libraries
build-depends:
base >=4.9 && <4.20
base >=4.9 && <4.21
, bytestring >=0.10.8.1 && <0.13
, containers >=0.5.7.1 && <0.7
, template-haskell >=2.11.1.0 && <2.22
, containers >=0.5.7.1 && <0.8
, template-haskell >=2.11.1.0 && <2.23
, time >=1.6.0.1 && <1.14
, transformers >=0.5.2.0 && <0.7

Expand All @@ -75,24 +75,24 @@ library

-- other dependencies
build-depends:
base-compat-batteries >=0.11.1 && <0.14
base-compat-batteries >=0.11.1 && <0.15
, aeson >=2.0.0.0 && <2.3
, 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
, cookie >=0.4.3 && <0.6
, generics-sop >=0.5.1.0 && <0.6
, hashable >=1.2.7.0 && <1.5
, hashable >=1.2.7.0 && <1.6
, http-media >=0.8.0.0 && <0.9
, insert-ordered-containers >=0.2.3 && <0.3
, lens >=4.16.1 && <5.3
, network >=2.6.3.5 && <3.2
, lens >=4.16.1 && <5.4
, network >=2.6.3.5 && <3.3
, optics-core >=0.2 && <0.5
, optics-th >=0.2 && <0.5
, scientific >=0.3.6.2 && <0.4
, unordered-containers >=0.2.9.0 && <0.3
, uuid-types >=1.0.3 && <1.1
, vector >=0.12.0.1 && <0.14
, QuickCheck >=2.10.1 && <2.15
, QuickCheck >=2.10.1 && <2.16

default-language: Haskell2010

Expand Down
Loading