diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50039becbd..544a9c6e78 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -160,8 +160,7 @@ jobs: name: Test hls-splice-plugin run: cabal test hls-splice-plugin-tests || cabal test hls-splice-plugin-tests - # TODO enable when it supports 9.10 - - if: matrix.test && matrix.ghc != '9.10' + - if: matrix.test name: Test hls-stan-plugin run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests diff --git a/cabal.project b/cabal.project index bacb35e745..08d743c24e 100644 --- a/cabal.project +++ b/cabal.project @@ -8,7 +8,7 @@ packages: ./hls-test-utils -index-state: 2024-08-22T00:00:00Z +index-state: 2024-10-21T00:00:00Z tests: True test-show-details: direct diff --git a/docs/support/plugin-support.md b/docs/support/plugin-support.md index 895cfda25b..ee833347fd 100644 --- a/docs/support/plugin-support.md +++ b/docs/support/plugin-support.md @@ -65,6 +65,6 @@ For example, a plugin to provide a formatter which has itself been abandoned has | `hls-overloaded-record-dot-plugin` | 2 | | | `hls-semantic-tokens-plugin` | 2 | | | `hls-floskell-plugin` | 3 | 9.10.1 | -| `hls-stan-plugin` | 3 | 9.10.1 | +| `hls-stan-plugin` | 3 | | | `hls-retrie-plugin` | 3 | 9.10.1 | | `hls-splice-plugin` | 3 | 9.10.1 | diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 447882a61e..1f5fce4b5f 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -791,13 +791,13 @@ flag stan manual: True common stan - if flag(stan) && impl(ghc < 9.10.0) + if flag(stan) build-depends: haskell-language-server:hls-stan-plugin cpp-options: -Dhls_stan library hls-stan-plugin import: defaults, pedantic, warnings - if flag(stan) && impl(ghc < 9.10.0) + if flag(stan) buildable: True else buildable: False @@ -825,7 +825,7 @@ library hls-stan-plugin test-suite hls-stan-plugin-tests import: defaults, pedantic, test-defaults, warnings - if flag(stan) && impl(ghc < 9.10.0) + if flag(stan) buildable: True else buildable: False