diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b8bf1f47..3c36a857 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.8.2', '9.6.4', '9.4.8', '9.2.8'] + ghc: ['9.10.1', '9.8.2', '9.6.5', '9.4.8', '9.2.8'] os: [ubuntu-latest, macOS-latest, windows-latest] steps: diff --git a/ChangeLog.md b/ChangeLog.md index 84b4d53c..a8bf164c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog hie-bios +## 2024-05-20 - 0.14.1 + +* Allow building with GHC 9.10.1 [#435](https://github.com/haskell/hie-bios/pull/435) + ## 2024-04-22 - 0.14.0 * Add Loading Style option to 'runAction' [#433](https://github.com/haskell/hie-bios/pull/433) diff --git a/hie-bios.cabal b/hie-bios.cabal index 79f605e6..e76ccf99 100644 --- a/hie-bios.cabal +++ b/hie-bios.cabal @@ -1,6 +1,6 @@ Cabal-Version: 2.2 Name: hie-bios -Version: 0.14.0 +Version: 0.14.1 Author: Matthew Pickering Maintainer: Matthew Pickering License: BSD-3-Clause @@ -139,7 +139,7 @@ Extra-Source-Files: README.md tests/projects/stack-with-yaml/stack-with-yaml.cabal tests/projects/stack-with-yaml/src/Lib.hs -tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 +tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1 Library Default-Language: Haskell2010 @@ -173,10 +173,10 @@ Library cryptohash-sha1 >= 0.11.100 && < 0.12, directory >= 1.3.0 && < 1.4, filepath >= 1.4.1 && < 1.6, - time >= 1.8.0 && < 1.14, + time >= 1.8.0 && < 1.15, extra >= 1.6.14 && < 1.8, prettyprinter ^>= 1.6 || ^>= 1.7.0, - ghc >= 9.2.1 && < 9.9, + ghc >= 9.2.1 && < 9.11, transformers >= 0.5.2 && < 0.7, temporary >= 1.2 && < 1.4, template-haskell, diff --git a/tests/BiosTests.hs b/tests/BiosTests.hs index c5952272..ec17e7a6 100644 --- a/tests/BiosTests.hs +++ b/tests/BiosTests.hs @@ -351,9 +351,9 @@ stackYaml resolver pkgs = unlines stackYamlResolver :: String stackYamlResolver = #if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,8,0,0))) - "nightly-2024-02-26" -- GHC 9.8.1 + "nightly-2024-05-19" -- GHC 9.8.2 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,6,0,0))) - "lts-22.12" -- GHC 9.6.4 + "lts-22.22" -- GHC 9.6.5 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,4,0,0))) "lts-21.25" -- GHC 9.4.8 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)))