From 16bde074fae491095d9f865fb551ee856cc5f3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Wed, 3 Jan 2024 10:42:20 +0100 Subject: [PATCH 1/2] Allow building with GHC 9.8 --- .github/workflows/haskell-ci.yml | 14 +++++++------- CHANGELOG.md | 5 +++++ elm-street.cabal | 12 ++++++------ stack.yaml | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 27e303a..b956f51 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -14,17 +14,17 @@ jobs: os: [ubuntu-latest] cabal: ["3.10.1.0"] ghc: - - 8.10.7 - 9.0.2 - 9.2.8 - - 9.4.6 - - 9.6.2 + - 9.4.8 + - 9.6.3 + - 9.8.1 include: # Test only with latest GHC on windows and macOS - os: macOS-latest - ghc: 9.6.2 + ghc: 9.8.1 - os: windows-latest - ghc: 9.6.2 + ghc: 9.8.1 steps: - uses: actions/checkout@v3 @@ -63,8 +63,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - stack: [2.11.1] - ghc: [9.4.6] + stack: [2.13.1] + ghc: [9.4.8] steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5245237..2c93a93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ `elm-street` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.2.2.0 - Jan 4, 2024 + +* Version bumps to allow building with GHC 9.8.1 +* Remove GHC 8.10.7 from CI + ## 0.2.1.1 - Aug 3, 2023 * Add missing extra-source-files: test/golden/oneType.json to cabal diff --git a/elm-street.cabal b/elm-street.cabal index e6ab51d..f8f2b18 100644 --- a/elm-street.cabal +++ b/elm-street.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: elm-street -version: 0.2.1.1 +version: 0.2.2.0 synopsis: Crossing the road between Haskell and Elm description: `Elm-street` allows you to generate automatically derived from Haskell types @@ -19,18 +19,18 @@ build-type: Simple extra-doc-files: README.md CHANGELOG.md extra-source-files: test/golden/oneType.json -tested-with: GHC == 8.10.7 - GHC == 9.0.2 +tested-with: GHC == 9.0.2 GHC == 9.2.8 - GHC == 9.4.6 - GHC == 9.6.2 + GHC == 9.4.8 + GHC == 9.6.3 + GHC == 9.8.1 source-repository head type: git location: https://github.com/Holmusk/elm-street.git common common-options - build-depends: base >= 4.11.1.0 && < 4.19 + build-depends: base >= 4.11.1.0 && < 4.20 ghc-options: -Wall -Wincomplete-uni-patterns diff --git a/stack.yaml b/stack.yaml index 8d9b815..377040a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-21.9 +resolver: lts-21.25 From 49a2c49da2a18e88c326ee5d76dc86e73489c904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Wed, 3 Jan 2024 11:13:15 +0100 Subject: [PATCH 2/2] Use latest stack lts --- .github/workflows/haskell-ci.yml | 2 +- stack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b956f51..f32724a 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -64,7 +64,7 @@ jobs: strategy: matrix: stack: [2.13.1] - ghc: [9.4.8] + ghc: [9.6.3] steps: - uses: actions/checkout@v3 diff --git a/stack.yaml b/stack.yaml index 377040a..2d0dc93 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-21.25 +resolver: lts-22.4