Skip to content

HLS 1.10 packaging fixes #3551

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.

Sign up for GitHub

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 3 commits into from
Apr 5, 2023
Merged

HLS 1.10 packaging fixes #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad1b07
Bump hls-test-utils
wz1000 Apr 3, 2023
3732153
package bumps
wz1000 Apr 3, 2023
dd9467d
Merge branch 'master' into wip/hls-1.10-fixes
michaelpj Apr 5, 2023
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
4 changes: 2 additions & 2 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ common retrie

common tactic
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
build-depends: hls-tactics-plugin ^>= 1.8
build-depends: hls-tactics-plugin ^>= 1.8.1
cpp-options: -Dhls_tactic

common hlint
Expand Down Expand Up @@ -549,7 +549,7 @@ test-suite func-test
, lens-aeson
, ghcide
, ghcide-test-utils
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lsp-types
, aeson
, hls-plugin-api
Expand Down
2 changes: 1 addition & 1 deletion hie-compat/hie-compat.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.22
name: hie-compat
version: 0.3.1.0
version: 0.3.1.1
synopsis: HIE files for GHC 8.8 and other HIE file backports
license: Apache-2.0
description:
Expand Down
4 changes: 2 additions & 2 deletions hls-test-utils/hls-test-utils.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-test-utils
version: 1.5.0.0
version: 1.6.0.0
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 @@ -41,7 +41,7 @@ library
, directory
, extra
, filepath
, ghcide ^>=1.9 || ^>= 1.10
, ghcide ^>= 1.10
, hls-graph
, hls-plugin-api ^>=1.6
, lens
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test-suite tests
, base >=4.12 && < 5
, filepath
, hls-alternate-number-format-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lsp
, QuickCheck
, regex-tdfa
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test-suite tests
, directory
, filepath
, hls-cabal-fmt-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6

if flag(isolateTests)
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
2 changes: 1 addition & 1 deletion plugins/hls-cabal-plugin/hls-cabal-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test-suite tests
, filepath
, ghcide
, hls-cabal-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, tasty-hunit
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test-suite tests
, extra
, filepath
, hls-call-hierarchy-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, ghcide-test-utils
, lens
, lsp
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test-suite tests
, base >=4.12 && < 5
, filepath
, hls-change-type-signature-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lsp
, QuickCheck
, regex-tdfa
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-class-plugin/hls-class-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test-suite tests
, ghcide
, hls-class-plugin
, hls-plugin-api
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
2 changes: 1 addition & 1 deletion plugins/hls-code-range-plugin/hls-code-range-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test-suite tests
, filepath
, ghcide ^>=1.8 || ^>= 1.9 || ^>= 1.10
, hls-code-range-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp
, lsp-test
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-eval-plugin/hls-eval-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ test-suite tests
, filepath
, hls-eval-plugin
, hls-plugin-api
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
2 changes: 1 addition & 1 deletion plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ test-suite tests
, base
, filepath
, hls-explicit-fixity-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, text
4 changes: 2 additions & 2 deletions plugins/hls-floskell-plugin/hls-floskell-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-floskell-plugin
version: 1.0.2.0
version: 1.0.2.1
synopsis: Integration with the Floskell code formatter
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -48,4 +48,4 @@ test-suite tests
, base
, filepath
, hls-floskell-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
2 changes: 1 addition & 1 deletion plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ test-suite tests
, filepath
, hls-fourmolu-plugin
, hls-plugin-api
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lsp-test
2 changes: 1 addition & 1 deletion plugins/hls-gadt-plugin/hls-gadt-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test-suite tests
, base
, filepath
, hls-gadt-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp
, lsp-test
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ test-suite tests
, base
, filepath
, hls-haddock-comments-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, text
2 changes: 1 addition & 1 deletion plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ test-suite tests
, filepath
, hls-hlint-plugin
, hls-plugin-api
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
2 changes: 1 addition & 1 deletion plugins/hls-module-name-plugin/hls-module-name-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ test-suite tests
, base
, filepath
, hls-module-name-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
2 changes: 1 addition & 1 deletion plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ test-suite tests
, base
, filepath
, hls-ormolu-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lsp-types
, ormolu
2 changes: 1 addition & 1 deletion plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test-suite tests
, base
, filepath
, hls-pragmas-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
2 changes: 1 addition & 1 deletion plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ test-suite tests
, text
, filepath
, hls-qualify-imported-names-plugin
, hls-test-utils ^>= 1.5
, hls-test-utils ^>= 1.6
2 changes: 1 addition & 1 deletion plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ test-suite tests
, base
, filepath
, hls-refactor-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-rename-plugin/hls-rename-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-rename-plugin
version: 1.0.2.0
version: 1.0.2.1
synopsis: Rename 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 @@ -58,4 +58,4 @@ test-suite tests
, filepath
, hls-plugin-api
, hls-rename-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
2 changes: 1 addition & 1 deletion plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ test-suite tests
, hls-plugin-api
, hls-refactor-plugin
, hls-retrie-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, text
2 changes: 1 addition & 1 deletion plugins/hls-splice-plugin/hls-splice-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ test-suite tests
, base
, filepath
, hls-splice-plugin
, hls-test-utils ^>= 1.5
, hls-test-utils ^>= 1.6
, text
2 changes: 1 addition & 1 deletion plugins/hls-stan-plugin/hls-stan-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test-suite test
, filepath
, hls-stan-plugin
, hls-plugin-api
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, lens
, lsp-types
, text
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: hls-stylish-haskell-plugin
version: 1.0.1.2
version: 1.0.1.3
synopsis: Integration with the Stylish Haskell code formatter
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
Expand Down Expand Up @@ -50,4 +50,4 @@ test-suite tests
, base
, filepath
, hls-stylish-haskell-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.4
category: Development
name: hls-tactics-plugin
version: 1.8.0.0
version: 1.8.1.0
synopsis: Wingman 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 @@ -185,7 +185,7 @@ test-suite tests
, ghcide
, hls-plugin-api
, hls-tactics-plugin
, hls-test-utils ^>=1.5
, hls-test-utils ^>=1.6
, hspec
, hspec-expectations
, lens
Expand Down