From 177baadf82f1cc51995b88078b5e114e8fad2fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20S=CC=8Cebek?= Date: Sun, 1 Sep 2024 15:53:19 +0200 Subject: [PATCH] Allow GHC 9.10 * add GHC 9.10 to tested * regenerate CI * allow `base` 4.20 --- - blocked by `palette` package - diagrams/palette/pull/9 --- .github/workflows/haskell-ci.yml | 5 +++++ swarm.cabal | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5abfdadef..6ab43c122 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -58,6 +58,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.8.2 compilerKind: ghc compilerVersion: 9.8.2 diff --git a/swarm.cabal b/swarm.cabal index e848437c9..5e3297a4e 100644 --- a/swarm.cabal +++ b/swarm.cabal @@ -38,7 +38,7 @@ maintainer: byorgey@gmail.com bug-reports: https://github.com/swarm-game/swarm/issues copyright: Brent Yorgey 2021 category: Game -tested-with: ghc ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 +tested-with: ghc ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1 extra-doc-files: CHANGELOG.md @@ -246,7 +246,7 @@ library swarm-topography JuicyPixels >=3.3 && <3.4, aeson >=2.2 && <2.3, array, - base >=4.14 && <4.20, + base >=4.14 && <4.21, containers >=0.6.2 && <0.8, extra >=1.7 && <1.8, hashable, @@ -328,7 +328,7 @@ library swarm-scenario JuicyPixels >=3.3 && <3.4, aeson >=2.2 && <2.3, array >=0.5.4 && <0.6, - base >=4.14 && <4.20, + base >=4.14 && <4.21, boolexpr >=0.2 && <0.3, bytestring >=0.10 && <0.13, clock >=0.8.2 && <0.9, @@ -426,7 +426,7 @@ library swarm-engine aeson >=2.2 && <2.3, array >=0.5.4 && <0.6, astar >=0.3 && <0.3.1, - base >=4.14 && <4.20, + base >=4.14 && <4.21, boolexpr >=0.2 && <0.3, clock >=0.8.2 && <0.9, containers >=0.6.2 && <0.8, @@ -594,7 +594,7 @@ library swarm-util autogen-modules: Paths_swarm build-depends: aeson >=2.2 && <2.3, - base >=4.14 && <4.20, + base >=4.14 && <4.21, boolexpr >=0.2 && <0.3, clock >=0.8.2 && <0.9, containers >=0.6.2 && <0.8, @@ -608,7 +608,7 @@ library swarm-util minimorph >=0.3 && <0.4, mtl >=2.2.2 && <2.4, servant-docs >=0.12 && <0.14, - template-haskell >=2.16 && <2.22, + template-haskell >=2.16 && <2.23, text >=1.2.4 && <2.2, transformers >=0.5 && <0.7, vector >=0.12 && <0.14, @@ -647,7 +647,7 @@ library swarm-doc build-depends: aeson >=2.2 && <2.3, - base >=4.14 && <4.20, + base >=4.14 && <4.21, containers >=0.6.2 && <0.8, directory >=1.3 && <1.4, dotgen >=0.4 && <0.5, @@ -658,7 +658,7 @@ library swarm-doc mtl >=2.2.2 && <2.4, pandoc >=3.0 && <3.3, pandoc-types >=1.23 && <1.24, - scientific >=0.3.6 && <0.3.8, + scientific >=0.3.6 && <0.4, servant-docs >=0.12 && <0.14, text >=1.2.4 && <2.2, transformers >=0.5 && <0.7, @@ -741,7 +741,7 @@ library swarm-tui build-depends: aeson >=2.2 && <2.3, array >=0.5.4 && <0.6, - base >=4.14 && <4.20, + base >=4.14 && <4.21, brick >=2.1.1 && <2.5, brick-list-skip >=0.1.1.2 && <0.2, bytestring >=0.10 && <0.13,