Skip to content

Commit

Permalink
Bump to 2.4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hasufell committed Nov 14, 2023
1 parent fb11328 commit a6e9d60
Show file tree
Hide file tree
Showing 33 changed files with 146 additions and 142 deletions.
12 changes: 6 additions & 6 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.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.8", "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 @@ -136,7 +136,7 @@ jobs:
, ARTIFACT: "x86_64-linux-unknown"
, ADD_CABAL_ARGS: "--enable-split-sections"
}
- ghc: 9.4.7
- ghc: 9.4.8
platform:
{ image: "fedora:27"
, installCmd: "dnf install -y"
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ghc: ["9.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.8", "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.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.8", "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.8.1", "9.6.3", "9.4.7", "9.2.8"]
ghc: ["9.8.1", "9.6.3", "9.4.8", "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.8.1", "9.6.3", "9.4.7", "9.2.8", "9.0.2"]
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2"]
steps:
- name: install windows deps
shell: pwsh
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog for haskell-language-server

## 2.4.0.1

* bindist support for 9.4.8

## 2.4.0.0

* Initial support for GHC 9.8.1, without plugins dependent on `ghc-exactprint`
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.4.0.0
version: 2.4.0.1
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.4.0.0
version: 2.4.0.1
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.4.0.0,
hls-plugin-api == 2.4.0.1,
lens,
list-t,
hiedb == 0.4.4.*,
Expand All @@ -85,7 +85,7 @@ library
row-types,
text-rope,
safe-exceptions,
hls-graph == 2.4.0.0,
hls-graph == 2.4.0.1,
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.4.0.0
version: 2.4.0.1
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.4.0.0
build-depends: hls-cabal-fmt-plugin == 2.4.0.1
cpp-options: -Dhls_cabalfmt

common cabal
if flag(cabal)
build-depends: hls-cabal-plugin == 2.4.0.0
build-depends: hls-cabal-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-class-plugin == 2.4.0.1
cpp-options: -Dhls_class

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

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

common importLens
if flag(importLens)
build-depends: hls-explicit-imports-plugin == 2.4.0.0
build-depends: hls-explicit-imports-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-rename-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-retrie-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-hlint-plugin == 2.4.0.1
cpp-options: -Dhls_hlint

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

common pragmas
if flag(pragmas)
build-depends: hls-pragmas-plugin == 2.4.0.0
build-depends: hls-pragmas-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-splice-plugin == 2.4.0.1
cpp-options: -Dhls_splice

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

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

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

common changeTypeSignature
if flag(changeTypeSignature)
build-depends: hls-change-type-signature-plugin == 2.4.0.0
build-depends: hls-change-type-signature-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-gadt-plugin == 2.4.0.1
cpp-options: -Dhls_gadt

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

common explicitFields
if flag(explicitFields)
build-depends: hls-explicit-record-fields-plugin == 2.4.0.0
build-depends: hls-explicit-record-fields-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-overloaded-record-dot-plugin == 2.4.0.1
cpp-options: -Dhls_overloaded_record_dot

-- formatters

common floskell
if flag(floskell) && impl(ghc < 9.5)
build-depends: hls-floskell-plugin == 2.4.0.0
build-depends: hls-floskell-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-fourmolu-plugin == 2.4.0.1
cpp-options: -Dhls_fourmolu

common ormolu
if flag(ormolu) && impl(ghc < 9.7)
build-depends: hls-ormolu-plugin == 2.4.0.0
build-depends: hls-ormolu-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-stylish-haskell-plugin == 2.4.0.1
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.4.0.0
build-depends: hls-refactor-plugin == 2.4.0.1
cpp-options: -Dhls_refactor

library
Expand Down Expand Up @@ -372,12 +372,12 @@ library
, cryptohash-sha1
, data-default
, ghc
, ghcide == 2.4.0.0
, ghcide == 2.4.0.1
, githash >=0.1.6.1
, lsp >= 2.3.0.0
, hie-bios
, hiedb
, hls-plugin-api == 2.4.0.0
, hls-plugin-api == 2.4.0.1
, 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.4.0.0
, hls-test-utils == 2.4.0.1
, 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.4.0.0
version: 2.4.0.1
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.4.0.0
version: 2.4.0.1
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.4.0.0
, hls-graph == 2.4.0.1
, lens
, lens-aeson
, lsp ^>=2.3
Expand Down
6 changes: 3 additions & 3 deletions hls-test-utils/hls-test-utils.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-test-utils
version: 2.4.0.0
version: 2.4.0.1
synopsis: Utilities used in the tests of Haskell Language Server
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -42,9 +42,9 @@ library
, directory
, extra
, filepath
, ghcide == 2.4.0.0
, ghcide == 2.4.0.1
, hls-graph
, hls-plugin-api == 2.4.0.0
, hls-plugin-api == 2.4.0.1
, lens
, lsp ^>=2.3
, lsp-test ^>=0.16
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-alternate-number-format-plugin
version: 2.4.0.0
version: 2.4.0.1
synopsis: Provide Alternate Number Formats plugin for Haskell Language Server
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -31,10 +31,10 @@ library
, base >=4.12 && < 5
, containers
, extra
, ghcide == 2.4.0.0
, ghcide == 2.4.0.1
, ghc-boot-th
, hls-graph
, hls-plugin-api == 2.4.0.0
, hls-plugin-api == 2.4.0.1
, hie-compat
, lens
, lsp ^>=2.3.0.0
Expand Down Expand Up @@ -62,7 +62,7 @@ test-suite tests
, base >=4.12 && < 5
, filepath
, hls-alternate-number-format-plugin
, hls-test-utils == 2.4.0.0
, hls-test-utils == 2.4.0.1
, lsp
, QuickCheck
, regex-tdfa
Expand Down
8 changes: 4 additions & 4 deletions plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-cabal-fmt-plugin
version: 2.4.0.0
version: 2.4.0.1
synopsis: Integration with the cabal-fmt code formatter
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -33,8 +33,8 @@ library
, base >=4.12 && <5
, directory
, filepath
, ghcide == 2.4.0.0
, hls-plugin-api == 2.4.0.0
, ghcide == 2.4.0.1
, hls-plugin-api == 2.4.0.1
, lens
, lsp-types
, mtl
Expand All @@ -56,7 +56,7 @@ test-suite tests
, directory
, filepath
, hls-cabal-fmt-plugin
, hls-test-utils == 2.4.0.0
, hls-test-utils == 2.4.0.1

if flag(isolateTests)
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
Loading

0 comments on commit a6e9d60

Please sign in to comment.