Skip to content

Adjust bounds #1701

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 10, 2021
Merged

Adjust bounds #1701

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
81ed8c2
Bump up lower bounds of hls-plugin-api to 1.1
berberman Apr 10, 2021
cd65e53
Add bounds for hls-test-utils
berberman Apr 10, 2021
3068951
Merge branch 'master' into hls-plugin-api-1.1
jneira Apr 10, 2021
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
10 changes: 5 additions & 5 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ library
, lsp
, hie-bios
, hiedb
, hls-plugin-api >= 1.0 && < 1.2
, hls-plugin-api ^>= 1.1
, hslogger
, optparse-applicative
, optparse-simple
Expand Down Expand Up @@ -332,7 +332,7 @@ executable haskell-language-server
, mtl
, regex-tdfa
, safe-exceptions
, shake >=0.17.5
, shake
, sqlite-simple
, temporary
, transformers
Expand Down Expand Up @@ -387,11 +387,11 @@ test-suite func-test
, hspec-expectations
, lens
, ghcide
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, lsp-types
, aeson
, hls-plugin-api >= 1.0 && < 1.2
, lsp-test == 0.14.0.0
, hls-plugin-api
, lsp-test
, containers
, unordered-containers

Expand Down
6 changes: 2 additions & 4 deletions hls-plugin-api/hls-plugin-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ synopsis: Haskell Language Server API for plugin communication
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>

homepage:
https://github.com/haskell/haskell-language-server/hls-plugin-api

homepage: https://github.com/haskell/haskell-language-server#readme
bug-reports: https://github.com/haskell/haskell-language-server/issues
license: Apache-2.0
license-file: LICENSE
Expand Down Expand Up @@ -48,7 +46,7 @@ library
, hashable
, hslogger
, lens
, lsp ^>=1.2.0
, lsp ^>=1.2
, opentelemetry
, process
, regex-tdfa >=1.3.1.0
Expand Down
2 changes: 1 addition & 1 deletion hls-test-utils/hls-test-utils.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>

homepage:
https://github.com/haskell/haskell-language-server/hls-test-utils
https://github.com/haskell/haskell-language-server#readme

bug-reports: https://github.com/haskell/haskell-language-server/issues
license: Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ test-suite tests
, base
, bytestring
, hls-brittany-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, text
4 changes: 2 additions & 2 deletions 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 @@ -30,7 +30,7 @@ library
, ghc
, ghc-exactprint
, ghcide ^>=1.1.0.0
, hls-plugin-api >=1.0 && <1.2
, hls-plugin-api ^>=1.1
, lens
, lsp
, shake
Expand All @@ -56,7 +56,7 @@ test-suite tests
, bytestring
, filepath
, hls-class-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, lens
, lsp-test
, lsp-types
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 @@ -105,7 +105,7 @@ test-suite tests
, extra
, filepath
, hls-eval-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, lens
, lsp-test
, lsp-types
Expand Down
59 changes: 31 additions & 28 deletions plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
cabal-version: 2.2
name: hls-explicit-imports-plugin
version: 1.0.0.0
synopsis: Explicit imports plugin for Haskell Language Server
license: Apache-2.0
license-file: LICENSE
author: Pepe Iborra
maintainer: pepeiborra@gmail.com
category: Development
build-type: Simple
cabal-version: 2.2
name: hls-explicit-imports-plugin
version: 1.0.0.0
synopsis: Explicit imports plugin for Haskell Language Server
license: Apache-2.0
license-file: LICENSE
author: Pepe Iborra
maintainer: pepeiborra@gmail.com
category: Development
build-type: Simple
extra-source-files:
LICENSE
include/ghc-api-version.h
LICENSE

library
exposed-modules: Ide.Plugin.ExplicitImports
hs-source-dirs: src
build-depends: aeson
, base >=4.12 && <5
, containers
, deepseq
, lsp-types
, lsp
, hls-plugin-api >= 1.0 && < 1.2
, ghc
, ghcide ^>= 1.1.0.0
, shake
, text
, unordered-containers
exposed-modules: Ide.Plugin.ExplicitImports
hs-source-dirs: src
build-depends:
, aeson
, base >=4.12 && <5
, containers
, deepseq
, ghc
, ghcide ^>=1.1.0.0
, hls-plugin-api ^>=1.1
, lsp
, lsp-types
, shake
, text
, unordered-containers

default-language: Haskell2010
include-dirs: include
default-extensions: DataKinds, TypeOperators
default-language: Haskell2010
include-dirs: include
default-extensions:
DataKinds
TypeOperators
4 changes: 2 additions & 2 deletions 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 @@ -30,7 +30,7 @@ library
, ghc
, ghc-exactprint
, ghcide ^>=1.1.0.0
, hls-plugin-api >=1.0 && <1.2
, hls-plugin-api ^>=1.1
, lsp-types
, text
, unordered-containers
Expand All @@ -51,5 +51,5 @@ test-suite tests
, bytestring
, filepath
, hls-haddock-comments-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, 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 @@ -44,7 +44,7 @@ library
, ghcide ^>=1.1.0.0
, hashable
, hlint >=3.2
, hls-plugin-api >=1.0 && <1.2
, hls-plugin-api ^>=1.1
, hslogger
, lens
, lsp
Expand Down
74 changes: 39 additions & 35 deletions plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,44 @@
cabal-version: 2.2
name: hls-retrie-plugin
version: 1.0.0.1
synopsis: Retrie integration plugin for Haskell Language Server
license: Apache-2.0
license-file: LICENSE
author: Pepe Iborra
maintainer: pepeiborra@gmail.com
category: Development
build-type: Simple
cabal-version: 2.2
name: hls-retrie-plugin
version: 1.0.0.1
synopsis: Retrie integration plugin for Haskell Language Server
license: Apache-2.0
license-file: LICENSE
author: Pepe Iborra
maintainer: pepeiborra@gmail.com
category: Development
build-type: Simple
extra-source-files:
LICENSE
include/ghc-api-version.h
LICENSE

library
exposed-modules: Ide.Plugin.Retrie
hs-source-dirs: src
build-depends: aeson
, base >=4.12 && <5
, containers
, deepseq
, directory
, extra
, lsp
, lsp-types
, hls-plugin-api >= 1.0 && < 1.2
, ghc
, ghcide ^>= 1.1
, hashable
, retrie >=0.1.1.0
, safe-exceptions
, shake
, text
, transformers
, unordered-containers
exposed-modules: Ide.Plugin.Retrie
hs-source-dirs: src
build-depends:
, aeson
, base >=4.12 && <5
, containers
, deepseq
, directory
, extra
, ghc
, ghcide ^>=1.1
, hashable
, hls-plugin-api ^>=1.1
, lsp
, lsp-types
, retrie >=0.1.1.0
, safe-exceptions
, shake
, text
, transformers
, unordered-containers

default-language: Haskell2010
include-dirs: include
default-extensions:
DataKinds
TypeOperators

default-language: Haskell2010
include-dirs: include
default-extensions: DataKinds, TypeOperators
ghc-options: -Wno-unticked-promoted-constructors
ghc-options: -Wno-unticked-promoted-constructors
4 changes: 2 additions & 2 deletions 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 @@ -41,7 +41,7 @@ library
, ghc
, ghc-exactprint
, ghcide ^>=1.1.0.0
, hls-plugin-api >=1.0 && <1.2
, hls-plugin-api ^>=1.1
, lens
, lsp
, retrie
Expand Down Expand Up @@ -69,5 +69,5 @@ test-suite tests
, extra
, filepath
, hls-splice-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, text
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
Expand Up @@ -23,7 +23,7 @@ library
, ghc
, ghc-boot-th
, ghcide ^>=1.1.0.0
, hls-plugin-api >=1.0 && <1.2
, hls-plugin-api ^>=1.1
, lsp-types
, mtl
, stylish-haskell ^>=0.12
Expand All @@ -41,5 +41,5 @@ test-suite tests
, base
, bytestring
, hls-stylish-haskell-plugin
, hls-test-utils
, hls-test-utils ^>= 1.0.0.0
, text
Loading