Skip to content

Commit 0241c47

Browse files
berbermanjneira
berberman
and
jneira
authored
Adjust bounds (#1701)
* Bump up lower bounds of hls-plugin-api to 1.1 * Add bounds for hls-test-utils Co-authored-by: Javier Neira <atreyu.bbb@gmail.com>
1 parent 3f8d33c commit 0241c47

File tree

13 files changed

+142
-135
lines changed

13 files changed

+142
-135
lines changed

‎haskell-language-server.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ library
6868
, lsp
6969
, hie-bios
7070
, hiedb
71-
, hls-plugin-api >= 1.0 && < 1.2
71+
, hls-plugin-api ^>= 1.1
7272
, hslogger
7373
, optparse-applicative
7474
, optparse-simple
@@ -332,7 +332,7 @@ executable haskell-language-server
332332
, mtl
333333
, regex-tdfa
334334
, safe-exceptions
335-
, shake >=0.17.5
335+
, shake
336336
, sqlite-simple
337337
, temporary
338338
, transformers
@@ -387,11 +387,11 @@ test-suite func-test
387387
, hspec-expectations
388388
, lens
389389
, ghcide
390-
, hls-test-utils
390+
, hls-test-utils ^>= 1.0.0.0
391391
, lsp-types
392392
, aeson
393-
, hls-plugin-api >= 1.0 && < 1.2
394-
, lsp-test == 0.14.0.0
393+
, hls-plugin-api
394+
, lsp-test
395395
, containers
396396
, unordered-containers
397397

‎hls-plugin-api/hls-plugin-api.cabal

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ synopsis: Haskell Language Server API for plugin communication
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
77

8-
homepage:
9-
https://github.com/haskell/haskell-language-server/hls-plugin-api
10-
8+
homepage: https://github.com/haskell/haskell-language-server#readme
119
bug-reports: https://github.com/haskell/haskell-language-server/issues
1210
license: Apache-2.0
1311
license-file: LICENSE
@@ -48,7 +46,7 @@ library
4846
, hashable
4947
, hslogger
5048
, lens
51-
, lsp ^>=1.2.0
49+
, lsp ^>=1.2
5250
, opentelemetry
5351
, process
5452
, regex-tdfa >=1.3.1.0

‎hls-test-utils/hls-test-utils.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
77

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

1111
bug-reports: https://github.com/haskell/haskell-language-server/issues
1212
license: Apache-2.0

‎plugins/hls-brittany-plugin/hls-brittany-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ test-suite tests
4444
, base
4545
, bytestring
4646
, hls-brittany-plugin
47-
, hls-test-utils
47+
, hls-test-utils ^>= 1.0.0.0
4848
, text

‎plugins/hls-class-plugin/hls-class-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ library
3030
, ghc
3131
, ghc-exactprint
3232
, ghcide ^>=1.1.0.0
33-
, hls-plugin-api >=1.0 && <1.2
33+
, hls-plugin-api ^>=1.1
3434
, lens
3535
, lsp
3636
, shake
@@ -56,7 +56,7 @@ test-suite tests
5656
, bytestring
5757
, filepath
5858
, hls-class-plugin
59-
, hls-test-utils
59+
, hls-test-utils ^>= 1.0.0.0
6060
, lens
6161
, lsp-test
6262
, lsp-types

‎plugins/hls-eval-plugin/hls-eval-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ test-suite tests
105105
, extra
106106
, filepath
107107
, hls-eval-plugin
108-
, hls-test-utils
108+
, hls-test-utils ^>= 1.0.0.0
109109
, lens
110110
, lsp-test
111111
, lsp-types

‎plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
1-
cabal-version: 2.2
2-
name: hls-explicit-imports-plugin
3-
version: 1.0.0.0
4-
synopsis: Explicit imports plugin for Haskell Language Server
5-
license: Apache-2.0
6-
license-file: LICENSE
7-
author: Pepe Iborra
8-
maintainer: pepeiborra@gmail.com
9-
category: Development
10-
build-type: Simple
1+
cabal-version: 2.2
2+
name: hls-explicit-imports-plugin
3+
version: 1.0.0.0
4+
synopsis: Explicit imports plugin for Haskell Language Server
5+
license: Apache-2.0
6+
license-file: LICENSE
7+
author: Pepe Iborra
8+
maintainer: pepeiborra@gmail.com
9+
category: Development
10+
build-type: Simple
1111
extra-source-files:
12-
LICENSE
1312
include/ghc-api-version.h
13+
LICENSE
1414

1515
library
16-
exposed-modules: Ide.Plugin.ExplicitImports
17-
hs-source-dirs: src
18-
build-depends: aeson
19-
, base >=4.12 && <5
20-
, containers
21-
, deepseq
22-
, lsp-types
23-
, lsp
24-
, hls-plugin-api >= 1.0 && < 1.2
25-
, ghc
26-
, ghcide ^>= 1.1.0.0
27-
, shake
28-
, text
29-
, unordered-containers
16+
exposed-modules: Ide.Plugin.ExplicitImports
17+
hs-source-dirs: src
18+
build-depends:
19+
, aeson
20+
, base >=4.12 && <5
21+
, containers
22+
, deepseq
23+
, ghc
24+
, ghcide ^>=1.1.0.0
25+
, hls-plugin-api ^>=1.1
26+
, lsp
27+
, lsp-types
28+
, shake
29+
, text
30+
, unordered-containers
3031

31-
default-language: Haskell2010
32-
include-dirs: include
33-
default-extensions: DataKinds, TypeOperators
32+
default-language: Haskell2010
33+
include-dirs: include
34+
default-extensions:
35+
DataKinds
36+
TypeOperators

‎plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ library
3030
, ghc
3131
, ghc-exactprint
3232
, ghcide ^>=1.1.0.0
33-
, hls-plugin-api >=1.0 && <1.2
33+
, hls-plugin-api ^>=1.1
3434
, lsp-types
3535
, text
3636
, unordered-containers
@@ -51,5 +51,5 @@ test-suite tests
5151
, bytestring
5252
, filepath
5353
, hls-haddock-comments-plugin
54-
, hls-test-utils
54+
, hls-test-utils ^>= 1.0.0.0
5555
, text

‎plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ library
4444
, ghcide ^>=1.1.0.0
4545
, hashable
4646
, hlint >=3.2
47-
, hls-plugin-api >=1.0 && <1.2
47+
, hls-plugin-api ^>=1.1
4848
, hslogger
4949
, lens
5050
, lsp

‎plugins/hls-retrie-plugin/hls-retrie-plugin.cabal

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
1-
cabal-version: 2.2
2-
name: hls-retrie-plugin
3-
version: 1.0.0.1
4-
synopsis: Retrie integration plugin for Haskell Language Server
5-
license: Apache-2.0
6-
license-file: LICENSE
7-
author: Pepe Iborra
8-
maintainer: pepeiborra@gmail.com
9-
category: Development
10-
build-type: Simple
1+
cabal-version: 2.2
2+
name: hls-retrie-plugin
3+
version: 1.0.0.1
4+
synopsis: Retrie integration plugin for Haskell Language Server
5+
license: Apache-2.0
6+
license-file: LICENSE
7+
author: Pepe Iborra
8+
maintainer: pepeiborra@gmail.com
9+
category: Development
10+
build-type: Simple
1111
extra-source-files:
12-
LICENSE
1312
include/ghc-api-version.h
13+
LICENSE
1414

1515
library
16-
exposed-modules: Ide.Plugin.Retrie
17-
hs-source-dirs: src
18-
build-depends: aeson
19-
, base >=4.12 && <5
20-
, containers
21-
, deepseq
22-
, directory
23-
, extra
24-
, lsp
25-
, lsp-types
26-
, hls-plugin-api >= 1.0 && < 1.2
27-
, ghc
28-
, ghcide ^>= 1.1
29-
, hashable
30-
, retrie >=0.1.1.0
31-
, safe-exceptions
32-
, shake
33-
, text
34-
, transformers
35-
, unordered-containers
16+
exposed-modules: Ide.Plugin.Retrie
17+
hs-source-dirs: src
18+
build-depends:
19+
, aeson
20+
, base >=4.12 && <5
21+
, containers
22+
, deepseq
23+
, directory
24+
, extra
25+
, ghc
26+
, ghcide ^>=1.1
27+
, hashable
28+
, hls-plugin-api ^>=1.1
29+
, lsp
30+
, lsp-types
31+
, retrie >=0.1.1.0
32+
, safe-exceptions
33+
, shake
34+
, text
35+
, transformers
36+
, unordered-containers
37+
38+
default-language: Haskell2010
39+
include-dirs: include
40+
default-extensions:
41+
DataKinds
42+
TypeOperators
3643

37-
default-language: Haskell2010
38-
include-dirs: include
39-
default-extensions: DataKinds, TypeOperators
40-
ghc-options: -Wno-unticked-promoted-constructors
44+
ghc-options: -Wno-unticked-promoted-constructors

‎plugins/hls-splice-plugin/hls-splice-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, ghc
4242
, ghc-exactprint
4343
, ghcide ^>=1.1.0.0
44-
, hls-plugin-api >=1.0 && <1.2
44+
, hls-plugin-api ^>=1.1
4545
, lens
4646
, lsp
4747
, retrie
@@ -69,5 +69,5 @@ test-suite tests
6969
, extra
7070
, filepath
7171
, hls-splice-plugin
72-
, hls-test-utils
72+
, hls-test-utils ^>= 1.0.0.0
7373
, text

‎plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ library
2323
, ghc
2424
, ghc-boot-th
2525
, ghcide ^>=1.1.0.0
26-
, hls-plugin-api >=1.0 && <1.2
26+
, hls-plugin-api ^>=1.1
2727
, lsp-types
2828
, mtl
2929
, stylish-haskell ^>=0.12
@@ -41,5 +41,5 @@ test-suite tests
4141
, base
4242
, bytestring
4343
, hls-stylish-haskell-plugin
44-
, hls-test-utils
44+
, hls-test-utils ^>= 1.0.0.0
4545
, text

0 commit comments

Comments
 (0)