Skip to content

Release 2.4.0.0 #3834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build_task:
ARTIFACT: "x86_64-freebsd"
DISTRO: "na"
RUNNER_OS: "FreeBSD"
ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'"
ADD_CABAL_ARGS: "--enable-split-sections"
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
CABAL_CACHE_NONFATAL: "yes"
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ download_cabal_cache "$HOME/.local/bin/cabal-cache"
# build
ghcup install ghc "${GHC_VERSION}"
ghcup set ghc "${GHC_VERSION}"
(cd .. && ecabal update) # run cabal update outside project dir
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
ecabal update
ecabal user-config diff
ecabal user-config init -f
"ghc-${GHC_VERSION}" --info
Expand Down Expand Up @@ -56,7 +57,6 @@ case "$(uname)" in
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/${ARTIFACT}/haskell-language-server-wrapper${ext}"
;;
*)
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
emake --version
emake GHCUP=ghcup CABAL_CACHE_BIN=cabal-cache.sh S3_HOST="${S3_HOST}" S3_KEY="${ARTIFACT}" GHC_VERSION="${GHC_VERSION}" hls-ghc
;;
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
platform: [ { image: "debian:9"
, installCmd: "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
, toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
, DISTRO: "CentOS"
, ARTIFACT: "x86_64-linux-centos7"
, ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'" # centos7 gcc is too old to build text +simdutf
, ADD_CABAL_ARGS: "--enable-split-sections"
}
]
# TODO: rm
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
, ARTIFACT: "x86_64-linux-unknown"
, ADD_CABAL_ARGS: "--enable-split-sections"
}
- ghc: 9.6.2
- ghc: 9.6.3
platform:
{ image: "rockylinux:8"
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
Expand All @@ -154,7 +154,7 @@ jobs:
, ARTIFACT: "x86_64-linux-unknown"
, ADD_CABAL_ARGS: "--enable-split-sections"
}
- ghc: 9.6.3
- ghc: 9.8.1
platform:
{ image: "rockylinux:8"
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
steps:
- uses: docker://arm64v8/ubuntu:focal
name: Cleanup (aarch64 linux)
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8"]
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8"]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -372,7 +372,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
steps:
- name: install windows deps
shell: pwsh
Expand Down
22 changes: 21 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
# Changelog for haskell-language-server

## 2.3.0.0.0
## 2.4.0.0

* Initial support for GHC 9.8.1, without plugins dependent on `ghc-exactprint`
* Fix broken Windows binaries (#3822)

### Pull Requests

- Remove constraint on stm-hamt
([#3829](https://github.com/haskell/haskell-language-server/pull/3829)) by @iMichka
- Cleanup func-test suite
([#3828](https://github.com/haskell/haskell-language-server/pull/3828)) by @fendor
- Bump haskell/actions from 2.4.6 to 2.4.7 in /.github/actions/setup-build
([#3824](https://github.com/haskell/haskell-language-server/pull/3824)) by @dependabot[bot]
- Bump haskell/actions from 2.4.6 to 2.4.7
([#3823](https://github.com/haskell/haskell-language-server/pull/3823)) by @dependabot[bot]
- Release 2.3.0.0
([#3818](https://github.com/haskell/haskell-language-server/pull/3818)) by @wz1000
- GHC 9.8 support
([#3727](https://github.com/haskell/haskell-language-server/pull/3727)) by @wz1000

## 2.3.0.0

* Binaries for GHC 9.6.3
* Drop support for GHC 8.10
Expand Down
3 changes: 3 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ write-ghc-environment-files: never
index-state: 2023-10-06T06:12:29Z

constraints:
-- C++ is hard to distribute, especially on older GHCs
-- See https://github.com/haskell/haskell-language-server/issues/3822
text -simdutf,
-- For GHC 9.4, older versions of entropy fail to build on Windows
entropy >= 0.4.1.10,
-- For GHC 9.4
Expand Down
1 change: 1 addition & 0 deletions docs/support/ghc-version-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Support status (see the support policy below for more details):

| GHC version | Last supporting HLS version | Support status |
|--------------|--------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
| 9.8.1 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | initial support |
| 9.6.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
| 9.6.2 | [2.2.0.0](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
| 9.6.1 | [2.0.0.0](https://github.com/haskell/haskell-language-server/releases/tag/2.0.0.0) | basic support |
Expand Down
2 changes: 1 addition & 1 deletion ghcide-bench/ghcide-bench.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cabal-version: 3.0
build-type: Simple
category: Development
name: ghcide-bench
version: 2.3.0.0
version: 2.4.0.0
license: Apache-2.0
license-file: LICENSE
author: The Haskell IDE team
Expand Down
6 changes: 3 additions & 3 deletions ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cabal-version: 3.0
build-type: Simple
category: Development
name: ghcide
version: 2.3.0.0
version: 2.4.0.0
license: Apache-2.0
license-file: LICENSE
author: Digital Asset and Ghcide contributors
Expand Down Expand Up @@ -69,7 +69,7 @@ library
haddock-library >= 1.8 && < 1.12,
hashable,
hie-compat ^>= 0.3.0.0,
hls-plugin-api == 2.3.0.0,
hls-plugin-api == 2.4.0.0,
lens,
list-t,
hiedb == 0.4.3.*,
Expand All @@ -85,7 +85,7 @@ library
row-types,
text-rope,
safe-exceptions,
hls-graph == 2.3.0.0,
hls-graph == 2.4.0.0,
sorted-list,
sqlite-simple,
stm,
Expand Down
58 changes: 29 additions & 29 deletions haskell-language-server.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0
category: Development
name: haskell-language-server
version: 2.3.0.0
version: 2.4.0.0
synopsis: LSP server for GHC
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -198,129 +198,129 @@ flag cabalfmt

common cabalfmt
if flag(cabalfmt)
build-depends: hls-cabal-fmt-plugin == 2.3.0.0
build-depends: hls-cabal-fmt-plugin == 2.4.0.0
cpp-options: -Dhls_cabalfmt

common cabal
if flag(cabal)
build-depends: hls-cabal-plugin == 2.3.0.0
build-depends: hls-cabal-plugin == 2.4.0.0
cpp-options: -Dhls_cabal

common class
if flag(class) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-class-plugin == 2.3.0.0
build-depends: hls-class-plugin == 2.4.0.0
cpp-options: -Dhls_class

common callHierarchy
if flag(callHierarchy)
build-depends: hls-call-hierarchy-plugin == 2.3.0.0
build-depends: hls-call-hierarchy-plugin == 2.4.0.0
cpp-options: -Dhls_callHierarchy

common eval
if flag(eval)
build-depends: hls-eval-plugin == 2.3.0.0
build-depends: hls-eval-plugin == 2.4.0.0
cpp-options: -Dhls_eval

common importLens
if flag(importLens)
build-depends: hls-explicit-imports-plugin == 2.3.0.0
build-depends: hls-explicit-imports-plugin == 2.4.0.0
cpp-options: -Dhls_importLens

common rename
if flag(rename) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-rename-plugin == 2.3.0.0
build-depends: hls-rename-plugin == 2.4.0.0
cpp-options: -Dhls_rename

common retrie
if flag(retrie) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-retrie-plugin == 2.3.0.0
build-depends: hls-retrie-plugin == 2.4.0.0
cpp-options: -Dhls_retrie

common hlint
if flag(hlint) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-hlint-plugin == 2.3.0.0
build-depends: hls-hlint-plugin == 2.4.0.0
cpp-options: -Dhls_hlint

common moduleName
if flag(moduleName)
build-depends: hls-module-name-plugin == 2.3.0.0
build-depends: hls-module-name-plugin == 2.4.0.0
cpp-options: -Dhls_moduleName

common pragmas
if flag(pragmas)
build-depends: hls-pragmas-plugin == 2.3.0.0
build-depends: hls-pragmas-plugin == 2.4.0.0
cpp-options: -Dhls_pragmas

common splice
if flag(splice) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-splice-plugin == 2.3.0.0
build-depends: hls-splice-plugin == 2.4.0.0
cpp-options: -Dhls_splice

common alternateNumberFormat
if flag(alternateNumberFormat)
build-depends: hls-alternate-number-format-plugin == 2.3.0.0
build-depends: hls-alternate-number-format-plugin == 2.4.0.0
cpp-options: -Dhls_alternateNumberFormat

common qualifyImportedNames
if flag(qualifyImportedNames)
build-depends: hls-qualify-imported-names-plugin == 2.3.0.0
build-depends: hls-qualify-imported-names-plugin == 2.4.0.0
cpp-options: -Dhls_qualifyImportedNames

common codeRange
if flag(codeRange)
build-depends: hls-code-range-plugin == 2.3.0.0
build-depends: hls-code-range-plugin == 2.4.0.0
cpp-options: -Dhls_codeRange

common changeTypeSignature
if flag(changeTypeSignature)
build-depends: hls-change-type-signature-plugin == 2.3.0.0
build-depends: hls-change-type-signature-plugin == 2.4.0.0
cpp-options: -Dhls_changeTypeSignature

common gadt
if flag(gadt) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-gadt-plugin == 2.3.0.0
build-depends: hls-gadt-plugin == 2.4.0.0
cpp-options: -Dhls_gadt

common explicitFixity
if flag(explicitFixity)
build-depends: hls-explicit-fixity-plugin == 2.3.0.0
build-depends: hls-explicit-fixity-plugin == 2.4.0.0
cpp-options: -DexplicitFixity

common explicitFields
if flag(explicitFields)
build-depends: hls-explicit-record-fields-plugin == 2.3.0.0
build-depends: hls-explicit-record-fields-plugin == 2.4.0.0
cpp-options: -DexplicitFields

common overloadedRecordDot
if flag(overloadedRecordDot) && (impl(ghc >= 9.2.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-overloaded-record-dot-plugin == 2.3.0.0
build-depends: hls-overloaded-record-dot-plugin == 2.4.0.0
cpp-options: -Dhls_overloaded_record_dot

-- formatters

common floskell
if flag(floskell) && impl(ghc < 9.5)
build-depends: hls-floskell-plugin == 2.3.0.0
build-depends: hls-floskell-plugin == 2.4.0.0
cpp-options: -Dhls_floskell

common fourmolu
if flag(fourmolu) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-fourmolu-plugin == 2.3.0.0
build-depends: hls-fourmolu-plugin == 2.4.0.0
cpp-options: -Dhls_fourmolu

common ormolu
if flag(ormolu) && impl(ghc < 9.7)
build-depends: hls-ormolu-plugin == 2.3.0.0
build-depends: hls-ormolu-plugin == 2.4.0.0
cpp-options: -Dhls_ormolu

common stylishHaskell
if flag(stylishHaskell) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-stylish-haskell-plugin == 2.3.0.0
build-depends: hls-stylish-haskell-plugin == 2.4.0.0
cpp-options: -Dhls_stylishHaskell

common refactor
if flag(refactor) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-refactor-plugin == 2.3.0.0
build-depends: hls-refactor-plugin == 2.4.0.0
cpp-options: -Dhls_refactor

library
Expand Down Expand Up @@ -372,12 +372,12 @@ library
, cryptohash-sha1
, data-default
, ghc
, ghcide == 2.3.0.0
, ghcide == 2.4.0.0
, githash >=0.1.6.1
, lsp >= 2.2.0.0
, hie-bios
, hiedb
, hls-plugin-api == 2.3.0.0
, hls-plugin-api == 2.4.0.0
, optparse-applicative
, optparse-simple
, process
Expand Down Expand Up @@ -516,7 +516,7 @@ test-suite func-test
, lens-aeson
, ghcide
, ghcide-test-utils
, hls-test-utils == 2.3.0.0
, hls-test-utils == 2.4.0.0
, lsp-types
, aeson
, hls-plugin-api
Expand Down
2 changes: 1 addition & 1 deletion hls-graph/hls-graph.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-graph
version: 2.3.0.0
version: 2.4.0.0
synopsis: Haskell Language Server internal graph API
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server/tree/master/hls-graph#readme>
Expand Down
4 changes: 2 additions & 2 deletions hls-plugin-api/hls-plugin-api.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-plugin-api
version: 2.3.0.0
version: 2.4.0.0
synopsis: Haskell Language Server API for plugin communication
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -59,7 +59,7 @@ library
, filepath
, ghc
, hashable
, hls-graph == 2.3.0.0
, hls-graph == 2.4.0.0
, lens
, lens-aeson
, lsp ^>=2.2
Expand Down
Loading