From eb48bf971d9c67811c22d58468885b4aadcae2bf Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:37:19 +0100 Subject: [PATCH 1/9] Fix build for macOS --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98d0f017e9..293f61e5df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,6 +65,13 @@ jobs: echo "LINUX_CABAL_ARGS=--enable-executable-static --ghc-options=-split-sections" >> $GITHUB_ENV echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV + - name: Set some macOs specific things + if: matrix.os == 'macOS-latest' + env: + GHC_VER: ${{ matrix.ghc }} + run: | + echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV + - name: Build Server # Try building it twice in case of flakey builds on Windows run: | From c224ccc89e02e5945854e7de79594fda5701ff5e Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:39:08 +0100 Subject: [PATCH 2/9] Update hackage index --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 2a53ab0e8d..51d8cc1aba 100644 --- a/cabal.project +++ b/cabal.project @@ -23,7 +23,7 @@ package ghcide write-ghc-environment-files: never -index-state: 2020-12-13T11:31:58Z +index-state: 2021-01-03T11:58:44Z allow-newer: active:base, From 61dd1207e9169f11b6cc4a6134ec54d8cd6c1b90 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:40:53 +0100 Subject: [PATCH 3/9] Bump up hls-plugin-api version --- hls-plugin-api/hls-plugin-api.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal index a860049f85..9f42d83a4f 100644 --- a/hls-plugin-api/hls-plugin-api.cabal +++ b/hls-plugin-api/hls-plugin-api.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: hls-plugin-api -version: 0.5.0.1 +version: 0.6.0.0 synopsis: Haskell Language Server API for plugin communication description: Please see the README on GitHub at From e7b9cc9dacdec71c2cb15c37c0143a21264d13d8 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:41:12 +0100 Subject: [PATCH 4/9] Bump up ghcide version --- ghcide/ghcide.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 662569e03f..363925834e 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -2,7 +2,7 @@ cabal-version: 1.20 build-type: Simple category: Development name: ghcide -version: 0.6.0.2 +version: 0.7.0.0 license: Apache-2.0 license-file: LICENSE author: Digital Asset and Ghcide contributors @@ -56,7 +56,7 @@ library haskell-lsp-types == 0.22.*, haskell-lsp == 0.22.*, hie-compat, - hls-plugin-api, + hls-plugin-api >= 0.6, lens, mtl, network-uri, From 527c2e5a708c635ffdf92719b6bdeb8f68badbc4 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:42:05 +0100 Subject: [PATCH 5/9] Bump up hls version --- haskell-language-server.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index ceb89126bd..3d29f842de 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 category: Development name: haskell-language-server -version: 0.7.1.0 +version: 0.8.0.0 synopsis: LSP server for GHC description: Please see the README on GitHub at @@ -62,7 +62,7 @@ library , ghcide >=0.6.0.1 , gitrev , haskell-lsp ^>=0.22 - , hls-plugin-api >=0.5 + , hls-plugin-api >=0.6 , hslogger , optparse-applicative , optparse-simple @@ -346,7 +346,7 @@ common hls-test-utils , data-default , haskell-lsp , hie-bios - , hls-plugin-api + , hls-plugin-api >=0.6 , hslogger , hspec , hspec-core From ae163721473e6551851287af0d67926c40b299f9 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:51:12 +0100 Subject: [PATCH 6/9] Mention libs versions and ghcide-0.6.0.2 changelog --- ChangeLog.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 498cdb9489..585fc3d783 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,8 @@ ## 0.8.0 - This version adds support for ghc-8.10.3 +- `hls-plugin-api` is 0.6.0.0 and `ghcide`, 0.7.0.0 + - so this include [changes from `ghcide-0.6.0.2`](https://github.com/haskell/haskell-language-server/blob/master/ghcide/CHANGELOG.md#0602-2020-12-26) - It has a new brand plugin: hls-class-plugin, which helps to write class instances ![gif](https://user-images.githubusercontent.com/12473268/103059293-af071f80-4572-11eb-963a-7e76b45f28b9.gif) @@ -19,7 +21,8 @@ - ghcide lives now directly in this repository - the test suite has been cleaned and improved (continuing the work done in 0.7.0) -thanks to all contributors and happy new year! + +Thanks to all contributors and happy new year! ### Pull requests merged for 0.8.0 From 075df414e89903abeeca82226cd1abb0fc4e66da Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 15:58:15 +0100 Subject: [PATCH 7/9] Require newest ghcide version in hls --- haskell-language-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 3d29f842de..ce7166f7da 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -59,7 +59,7 @@ library , containers , data-default , ghc - , ghcide >=0.6.0.1 + , ghcide >=0.7 , gitrev , haskell-lsp ^>=0.22 , hls-plugin-api >=0.6 From c2ce8dec9b4edde7136748e192f9e64b1872b27d Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Sun, 3 Jan 2021 19:59:01 +0100 Subject: [PATCH 8/9] Rephrasing mention to libs versions Co-authored-by: Pepe Iborra --- ChangeLog.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 585fc3d783..f21cddc2f9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,8 +3,7 @@ ## 0.8.0 - This version adds support for ghc-8.10.3 -- `hls-plugin-api` is 0.6.0.0 and `ghcide`, 0.7.0.0 - - so this include [changes from `ghcide-0.6.0.2`](https://github.com/haskell/haskell-language-server/blob/master/ghcide/CHANGELOG.md#0602-2020-12-26) +- `hls-plugin-api` has been bumped to 0.6.0.0 and `ghcide` has been bumped from 0.6.0.1 to 0.7.0.0. - It has a new brand plugin: hls-class-plugin, which helps to write class instances ![gif](https://user-images.githubusercontent.com/12473268/103059293-af071f80-4572-11eb-963a-7e76b45f28b9.gif) From 529d07c3756c101aec569fb28b0fdd15c637e584 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 3 Jan 2021 20:27:56 +0100 Subject: [PATCH 9/9] Update ghcide changelog for 0.7.0 --- ghcide/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghcide/CHANGELOG.md b/ghcide/CHANGELOG.md index e313ff34c4..44dc80347c 100644 --- a/ghcide/CHANGELOG.md +++ b/ghcide/CHANGELOG.md @@ -1,3 +1,9 @@ +### 0.7.0 (2020-01-03) + +* Retry a failed cradle if the cradle descriptor changes (#762) - (Pepe Iborra) +* Fix extend imports regression (#769) - (Pepe Iborra) +* Perform memory measurement on SIGUSR1 (#761) - (Pepe Iborra) + ### 0.6.0.2 (2020-12-26) * Fix disappearing diagnostics bug (#959) - (Pepe Iborra) * Deduplicate module not found diagnostics (#952) - (Pepe Iborra)