From 9b491f7bbf21eb407f38e9d56f0cddc9f004b41f Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Tue, 11 Oct 2022 14:18:49 +0200 Subject: [PATCH] Drop compatibility with GHC 8.6.5 (#3101) * Drop compatibility with GHC 8.6.5 * drop a few more bits * fixup merge Co-authored-by: Javier Neira --- .github/workflows/caching.yml | 1 - .github/workflows/flags.yml | 1 - .github/workflows/hackage.yml | 1 - .github/workflows/test.yml | 7 ------- .gitpod.Dockerfile | 1 - bindist/ghcs | 1 - docs/support/ghc-version-support.md | 2 +- ghcide/ghcide.cabal | 2 +- haskell-language-server.cabal | 2 +- hls-graph/src/Development/IDE/Graph/Internal/Types.hs | 2 -- 10 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml index 8a31da287..ae4c9c07f 100644 --- a/.github/workflows/caching.yml +++ b/.github/workflows/caching.yml @@ -85,7 +85,6 @@ jobs: , "9.0.2" , "8.10.7" , "8.8.4" - , "8.6.5" ] os: [ "ubuntu-latest" , "macOS-latest" diff --git a/.github/workflows/flags.yml b/.github/workflows/flags.yml index 024ec0101..a4f070a4d 100644 --- a/.github/workflows/flags.yml +++ b/.github/workflows/flags.yml @@ -48,7 +48,6 @@ jobs: , "9.0.2" , "8.10.7" , "8.8.4" - , "8.6.5" ] os: [ "ubuntu-latest" ] diff --git a/.github/workflows/hackage.yml b/.github/workflows/hackage.yml index ac939f989..4378b8ffb 100644 --- a/.github/workflows/hackage.yml +++ b/.github/workflows/hackage.yml @@ -41,7 +41,6 @@ jobs: ghc: [ "9.0.2" , "8.10.7" , "8.8.4" - , "8.6.5" ] exclude: - ghc: "9.0.2" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e60018583..78bcf83e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,7 +64,6 @@ jobs: , "9.0.2" , "8.10.7" , "8.8.4" - , "8.6.5" ] os: [ "ubuntu-latest" , "macOS-latest" @@ -86,9 +85,6 @@ jobs: - os: ubuntu-latest ghc: '8.8.4' test: true - - os: ubuntu-latest - ghc: '8.6.5' - test: true - os: windows-latest ghc: '9.4.2' test: true @@ -101,9 +97,6 @@ jobs: - os: windows-latest ghc: '8.10.7' test: true - - os: windows-latest - ghc: '8.6.5' - test: true # only build rest of supported ghc versions for windows - os: windows-latest ghc: '8.8.4' diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 6deba1426..87dc2ff6a 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -7,7 +7,6 @@ RUN sudo install-packages build-essential curl libffi-dev libffi7 libgmp-dev lib echo 'export PATH=$HOME/.cabal/bin:$HOME/.local/bin:$PATH' >> $HOME/.bashrc && \ . /home/gitpod/.ghcup/env && \ # Install all verions of GHC that HLS supports. Putting GHC into Docker image makes workspace start much faster. - ghcup install ghc 8.6.5 && \ ghcup install ghc 8.8.4 && \ ghcup install ghc 8.10.7 && \ ghcup install ghc 9.0.2 && \ diff --git a/bindist/ghcs b/bindist/ghcs index 151afa125..d1c741c32 100644 --- a/bindist/ghcs +++ b/bindist/ghcs @@ -1,4 +1,3 @@ -8.6.5,cabal.project 8.8.4,cabal.project 8.10.7,cabal.project 9.0.2,cabal.project diff --git a/docs/support/ghc-version-support.md b/docs/support/ghc-version-support.md index 246d6036a..da7887f1f 100644 --- a/docs/support/ghc-version-support.md +++ b/docs/support/ghc-version-support.md @@ -32,7 +32,7 @@ Support status (see the support policy below for more details): | 8.8.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support, will be deprecated after LTS and HLS full support for ghc-9.2 | | 8.8.3 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1) | deprecated | | 8.8.2 | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0) | deprecated | -| 8.6.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support, will be deprecated after LTS and HLS full suppot for ghc-9.2 | +| 8.6.5 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated | | 8.6.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated | GHC versions not in the list have never been supported by HLS. diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 109cb252c..a3261e6e3 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -13,7 +13,7 @@ description: A library for building Haskell IDE's on top of the GHC API. homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme bug-reports: https://github.com/haskell/haskell-language-server/issues -tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4 +tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4 extra-source-files: README.md CHANGELOG.md test/data/**/*.project test/data/**/*.cabal diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index d6a63b16a..d44b07292 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -14,7 +14,7 @@ copyright: The Haskell IDE Team license: Apache-2.0 license-file: LICENSE build-type: Simple -tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4 +tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4 extra-source-files: README.md ChangeLog.md diff --git a/hls-graph/src/Development/IDE/Graph/Internal/Types.hs b/hls-graph/src/Development/IDE/Graph/Internal/Types.hs index 56d2d48ac..5bcaca0cf 100644 --- a/hls-graph/src/Development/IDE/Graph/Internal/Types.hs +++ b/hls-graph/src/Development/IDE/Graph/Internal/Types.hs @@ -13,9 +13,7 @@ module Development.IDE.Graph.Internal.Types where import Control.Applicative import Control.Monad.Catch #if __GLASGOW_HASKELL__ < 808 --- Needed in GHC 8.6.5 import Control.Concurrent.STM.Stats (TVar, atomically) -import Control.Monad.Fail #else import GHC.Conc (TVar, atomically) #endif