From 5c81ae41b37a0dc23c7eab31510146c67452ff4e Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Mon, 15 Jun 2026 19:55:45 +0200 Subject: [PATCH 1/4] Drop GHC 9.6.6, raise base lower bound to 4.20 --- .github/workflows/build-and-test.yaml | 2 -- jbeam-edit.cabal | 20 ++++++++++---------- package.yaml | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 2f291547..44c73b42 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -161,8 +161,6 @@ jobs: shell: bash run: cabal configure --project-file cabal.project.ci --prefer-oldest - - run: sed -i 's/ +lsp-server//' cabal.project.ci - if: matrix.ghc == '9.6.6' - name: Freeze and check dependencies env: CABAL_PROJECT: cabal.project.ci diff --git a/jbeam-edit.cabal b/jbeam-edit.cabal index ebb4c09e..e60f96df 100644 --- a/jbeam-edit.cabal +++ b/jbeam-edit.cabal @@ -11,7 +11,7 @@ license-file: LICENSE copyright: 2025 webdevred maintainer: example@example.com author: webdevred -tested-with: ghc ==9.6.6 ghc ==9.10.3 +tested-with: ghc ==9.10.3 homepage: https://github.com/webdevred/jbeam-edit#readme bug-reports: https://github.com/webdevred/jbeam-edit/issues synopsis: @@ -98,7 +98,7 @@ library -Wunused-packages build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -150,7 +150,7 @@ library jbeam-edit-transformation -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -198,7 +198,7 @@ library jbeam-language-server -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -244,7 +244,7 @@ executable jbeam-edit -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -282,7 +282,7 @@ executable jbeam-edit-dump-ast -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -327,7 +327,7 @@ executable jbeam-lsp-server -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -379,7 +379,7 @@ test-suite jbeam-edit-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -420,7 +420,7 @@ test-suite jbeam-edit-transformation-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, @@ -470,7 +470,7 @@ test-suite jbeam-language-server-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.18 && <4.22, + base >=4.20 && <4.22, bytestring, containers, directory >=1.3.8.0, diff --git a/package.yaml b/package.yaml index 1d760f29..119e7eb4 100644 --- a/package.yaml +++ b/package.yaml @@ -25,10 +25,10 @@ description: >- and can automatically rename nodes and update references. Custom formatting rules are supported via JBFL (JBeam Formatting Language). See the README for usage instructions and examples: https://github.com/webdevred/jbeam-edit#readme -tested-with: [GHC == 9.6.6, GHC == 9.10.3] +tested-with: [GHC == 9.10.3] dependencies: - - base >= 4.18 && < 4.22 + - base >= 4.20 && < 4.22 - bytestring - vector >= 0.13 - text >= 2.1.2 From 09d81f967e6ed0cb78f33f17f51283527d79fd17 Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Mon, 15 Jun 2026 20:42:25 +0200 Subject: [PATCH 2/4] Add GHC 9.14.1 support, remove base upper bound --- jbeam-edit.cabal | 20 ++++++++++---------- package.yaml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jbeam-edit.cabal b/jbeam-edit.cabal index e60f96df..d9842d78 100644 --- a/jbeam-edit.cabal +++ b/jbeam-edit.cabal @@ -11,7 +11,7 @@ license-file: LICENSE copyright: 2025 webdevred maintainer: example@example.com author: webdevred -tested-with: ghc ==9.10.3 +tested-with: ghc ==9.10.3 ghc ==9.14.1 homepage: https://github.com/webdevred/jbeam-edit#readme bug-reports: https://github.com/webdevred/jbeam-edit/issues synopsis: @@ -98,7 +98,7 @@ library -Wunused-packages build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -150,7 +150,7 @@ library jbeam-edit-transformation -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -198,7 +198,7 @@ library jbeam-language-server -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -244,7 +244,7 @@ executable jbeam-edit -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -282,7 +282,7 @@ executable jbeam-edit-dump-ast -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -327,7 +327,7 @@ executable jbeam-lsp-server -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -379,7 +379,7 @@ test-suite jbeam-edit-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -420,7 +420,7 @@ test-suite jbeam-edit-transformation-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, @@ -470,7 +470,7 @@ test-suite jbeam-language-server-test -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.20 && <4.22, + base >=4.20, bytestring, containers, directory >=1.3.8.0, diff --git a/package.yaml b/package.yaml index 119e7eb4..39a21a11 100644 --- a/package.yaml +++ b/package.yaml @@ -25,10 +25,10 @@ description: >- and can automatically rename nodes and update references. Custom formatting rules are supported via JBFL (JBeam Formatting Language). See the README for usage instructions and examples: https://github.com/webdevred/jbeam-edit#readme -tested-with: [GHC == 9.10.3] +tested-with: [GHC == 9.10.3, GHC == 9.14.1] dependencies: - - base >= 4.20 && < 4.22 + - base >= 4.20 - bytestring - vector >= 0.13 - text >= 2.1.2 From ec67b53b77d2e813d62063370f8f824c7e5ea40a Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Mon, 15 Jun 2026 20:53:49 +0200 Subject: [PATCH 3/4] Demote redundant-constraints to warning in CI --- cabal.project.ci | 1 + 1 file changed, 1 insertion(+) diff --git a/cabal.project.ci b/cabal.project.ci index 0fc256ed..0812f776 100644 --- a/cabal.project.ci +++ b/cabal.project.ci @@ -8,3 +8,4 @@ package jbeam-edit ghc-options: -Werror -Wwarn=unused-imports + -Wwarn=redundant-constraints From 294a34e56334ab9389b9d13635239bf38b92e9bf Mon Sep 17 00:00:00 2001 From: webdevred <148627186+webdevred@users.noreply.github.com> Date: Mon, 15 Jun 2026 21:15:17 +0200 Subject: [PATCH 4/4] Update release index-state to 2026-06-15 --- cabal.project.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project.release b/cabal.project.release index a5ebd4d0..9ab6c31c 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -1,7 +1,7 @@ import: cabal.project executable-static: True executable-stripping: True -index-state: hackage.haskell.org 2026-01-11T16:27:22Z +index-state: hackage.haskell.org 2026-06-15T00:00:00Z package * ghc-options: