From 6a918613d4409b16370730949e7d801ac12af3e5 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 30 Jun 2024 09:20:53 -0600 Subject: [PATCH 1/4] Bump deps and fix doctest for GHC 9.10 --- src/Data/Swagger.hs | 1 - swagger2.cabal | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Data/Swagger.hs b/src/Data/Swagger.hs index d4da584..9e1d29b 100644 --- a/src/Data/Swagger.hs +++ b/src/Data/Swagger.hs @@ -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': -- diff --git a/swagger2.cabal b/swagger2.cabal index 3166a5d..6c475bc 100644 --- a/swagger2.cabal +++ b/swagger2.cabal @@ -33,7 +33,7 @@ tested-with: custom-setup setup-depends: - base < 4.20 + base < 4.21 , Cabal < 3.11 , cabal-doctest >=1.0.6 && <1.1 @@ -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 @@ -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 , 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 From e0be1742672f9082d285ea8ea4ff4cb7f202b0e7 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 30 Jun 2024 10:29:26 -0600 Subject: [PATCH 2/4] Update ghc/cabal-install versions in CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7d3571..56cb623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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) From 7b5379d55e93b83e37eaad04528f9d7e5bb8a124 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Wed, 3 Jul 2024 14:31:37 -0600 Subject: [PATCH 3/4] Allow Cabal-3.12 --- swagger2.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger2.cabal b/swagger2.cabal index 6c475bc..f7e7f8f 100644 --- a/swagger2.cabal +++ b/swagger2.cabal @@ -34,7 +34,7 @@ tested-with: custom-setup setup-depends: base < 4.21 - , Cabal < 3.11 + , Cabal < 3.13 , cabal-doctest >=1.0.6 && <1.1 library From 3eae03f596d8eadf4a020fc6b65ca489170e45b1 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Fri, 5 Jul 2024 08:58:03 -0600 Subject: [PATCH 4/4] Allow hashable-1.5 --- swagger2.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger2.cabal b/swagger2.cabal index f7e7f8f..27f4a42 100644 --- a/swagger2.cabal +++ b/swagger2.cabal @@ -81,7 +81,7 @@ library -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint , 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.4