Skip to content

Commit 550bf81

Browse files
wz1000wz1000
committed
Bump all packages to version 2.0.0.0.
This simplifies the release process as we can bump all package versions in lockstep prior to a release instead of having to decide version bumps on a case to case basis while adhering to PVP. We don't test arbitrary configurations mixing versions of plugins/ghcide which you might get if you install HLS from hackage. With this in mind, it makes sense to pin the versions of all packages in this repository Exceptions include: - hie-compat (it is used by hiedb and is mostly separate from the other packages - it changes about once a GHC release) - shake-bench (not meant to be distributed for users, for internal testing only
1 parent d34d774 commit 550bf81

File tree

35 files changed

+161
-152
lines changed

35 files changed

+161
-152
lines changed

‎ChangeLog.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog for haskell-language-server
22

3+
## 2.0.0.0
4+
5+
- New versioning scheme for all packages distributed as part of HLS,
6+
versioning them in lockstep for each release.
7+
- Binaries for GHC 9.4.5
8+
- Keep instance lenses stable even if parsed results are unavailable (#3545)
9+
- Keep stale lenses for module name (#3570)
10+
- Keep type lenses stable (#3558)
11+
312
## 1.10.0.0
413

514
- Support for GHC 9.6

‎ghcide-bench/ghcide-bench.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide-bench
5-
version: 0.1.1
5+
version: 2.0.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: The Haskell IDE team

‎ghcide/ghcide.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide
5-
version: 1.10.0.0
5+
version: 2.0.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: Digital Asset and Ghcide contributors
@@ -65,7 +65,7 @@ library
6565
haddock-library >= 1.8 && < 1.12,
6666
hashable,
6767
hie-compat ^>= 0.3.0.0,
68-
hls-plugin-api ^>= 1.6,
68+
hls-plugin-api == 2.0.0.0,
6969
lens,
7070
list-t,
7171
hiedb == 0.4.3.*,
@@ -80,7 +80,7 @@ library
8080
regex-tdfa >= 1.3.1.0,
8181
text-rope,
8282
safe-exceptions,
83-
hls-graph ^>= 1.9,
83+
hls-graph == 2.0.0.0,
8484
sorted-list,
8585
sqlite-simple,
8686
stm,

‎haskell-language-server.cabal

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22
category: Development
33
name: haskell-language-server
4-
version: 1.10.0.0
4+
version: 2.0.0.0
55
synopsis: LSP server for GHC
66
description:
77
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -213,144 +213,144 @@ flag cabalfmt
213213

214214
common cabalfmt
215215
if flag(cabalfmt)
216-
build-depends: hls-cabal-fmt-plugin ^>= 0.1.0.0
216+
build-depends: hls-cabal-fmt-plugin == 2.0.0.0
217217
cpp-options: -Dhls_cabalfmt
218218

219219
common cabal
220220
if flag(cabal)
221-
build-depends: hls-cabal-plugin ^>= 0.1
221+
build-depends: hls-cabal-plugin == 2.0.0.0
222222
cpp-options: -Dhls_cabal
223223

224224
common class
225225
if flag(class)
226-
build-depends: hls-class-plugin ^>= 1.1
226+
build-depends: hls-class-plugin == 2.0.0.0
227227
cpp-options: -Dhls_class
228228

229229
common callHierarchy
230230
if flag(callHierarchy)
231-
build-depends: hls-call-hierarchy-plugin ^>= 1.2
231+
build-depends: hls-call-hierarchy-plugin == 2.0.0.0
232232
cpp-options: -Dhls_callHierarchy
233233

234234
common haddockComments
235235
if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
236-
build-depends: hls-haddock-comments-plugin ^>= 1.1
236+
build-depends: hls-haddock-comments-plugin == 2.0.0.0
237237
cpp-options: -Dhls_haddockComments
238238

239239
common eval
240240
if flag(eval)
241-
build-depends: hls-eval-plugin ^>= 1.5
241+
build-depends: hls-eval-plugin == 2.0.0.0
242242
cpp-options: -Dhls_eval
243243

244244
common importLens
245245
if flag(importLens)
246-
build-depends: hls-explicit-imports-plugin ^>= 1.2
246+
build-depends: hls-explicit-imports-plugin == 2.0.0.0
247247
cpp-options: -Dhls_importLens
248248

249249
common refineImports
250250
if flag(refineImports)
251-
build-depends: hls-refine-imports-plugin ^>=1.0
251+
build-depends: hls-refine-imports-plugin == 2.0.0.0
252252
cpp-options: -Dhls_refineImports
253253

254254
common rename
255255
if flag(rename)
256-
build-depends: hls-rename-plugin ^>= 1.0
256+
build-depends: hls-rename-plugin == 2.0.0.0
257257
cpp-options: -Dhls_rename
258258

259259
common retrie
260260
if flag(retrie)
261-
build-depends: hls-retrie-plugin ^>= 1.0
261+
build-depends: hls-retrie-plugin == 2.0.0.0
262262
cpp-options: -Dhls_retrie
263263

264264
common tactic
265265
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
266-
build-depends: hls-tactics-plugin ^>= 1.8.1
266+
build-depends: hls-tactics-plugin == 2.0.0.0
267267
cpp-options: -Dhls_tactic
268268

269269
common hlint
270270
if flag(hlint) && impl(ghc < 9.5)
271-
build-depends: hls-hlint-plugin ^>= 1.1
271+
build-depends: hls-hlint-plugin == 2.0.0.0
272272
cpp-options: -Dhls_hlint
273273

274274
common stan
275275
if flag(stan) && (impl(ghc >= 8.10) && impl(ghc < 9.0))
276-
build-depends: hls-stan-plugin ^>= 1.0
276+
build-depends: hls-stan-plugin == 2.0.0.0
277277
cpp-options: -Dhls_stan
278278

279279
common moduleName
280280
if flag(moduleName)
281-
build-depends: hls-module-name-plugin ^>= 1.1
281+
build-depends: hls-module-name-plugin == 2.0.0.0
282282
cpp-options: -Dhls_moduleName
283283

284284
common pragmas
285285
if flag(pragmas)
286-
build-depends: hls-pragmas-plugin ^>= 1.0
286+
build-depends: hls-pragmas-plugin == 2.0.0.0
287287
cpp-options: -Dhls_pragmas
288288

289289
common splice
290290
if flag(splice)
291-
build-depends: hls-splice-plugin ^>=1.1
291+
build-depends: hls-splice-plugin == 2.0.0.0
292292
cpp-options: -Dhls_splice
293293

294294
common alternateNumberFormat
295295
if flag(alternateNumberFormat)
296-
build-depends: hls-alternate-number-format-plugin ^>= 1.3
296+
build-depends: hls-alternate-number-format-plugin == 2.0.0.0
297297
cpp-options: -Dhls_alternateNumberFormat
298298

299299
common qualifyImportedNames
300300
if flag(qualifyImportedNames)
301-
build-depends: hls-qualify-imported-names-plugin ^>=1.0
301+
build-depends: hls-qualify-imported-names-plugin == 2.0.0.0
302302
cpp-options: -Dhls_qualifyImportedNames
303303

304304
common codeRange
305305
if flag(codeRange)
306-
build-depends: hls-code-range-plugin ^>= 1.1
306+
build-depends: hls-code-range-plugin == 2.0.0.0
307307
cpp-options: -Dhls_codeRange
308308

309309
common changeTypeSignature
310310
if flag(changeTypeSignature)
311-
build-depends: hls-change-type-signature-plugin ^>= 1.1
311+
build-depends: hls-change-type-signature-plugin == 2.0.0.0
312312
cpp-options: -Dhls_changeTypeSignature
313313

314314
common gadt
315315
if flag(gadt)
316-
build-depends: hls-gadt-plugin ^>= 1.0
316+
build-depends: hls-gadt-plugin == 2.0.0.0
317317
cpp-options: -Dhls_gadt
318318

319319
common explicitFixity
320320
if flag(explicitFixity)
321-
build-depends: hls-explicit-fixity-plugin ^>= 1.1
321+
build-depends: hls-explicit-fixity-plugin == 2.0.0.0
322322
cpp-options: -DexplicitFixity
323323

324324
common explicitFields
325325
if flag(explicitFields)
326-
build-depends: hls-explicit-record-fields-plugin ^>= 1.0
326+
build-depends: hls-explicit-record-fields-plugin == 2.0.0.0
327327
cpp-options: -DexplicitFields
328328

329329
-- formatters
330330

331331
common floskell
332332
if flag(floskell) && impl(ghc < 9.5)
333-
build-depends: hls-floskell-plugin ^>= 1.0
333+
build-depends: hls-floskell-plugin == 2.0.0.0
334334
cpp-options: -Dhls_floskell
335335

336336
common fourmolu
337337
if flag(fourmolu)
338-
build-depends: hls-fourmolu-plugin ^>= 1.1
338+
build-depends: hls-fourmolu-plugin == 2.0.0.0
339339
cpp-options: -Dhls_fourmolu
340340

341341
common ormolu
342342
if flag(ormolu) && impl(ghc < 9.5)
343-
build-depends: hls-ormolu-plugin ^>= 1.0
343+
build-depends: hls-ormolu-plugin == 2.0.0.0
344344
cpp-options: -Dhls_ormolu
345345

346346
common stylishHaskell
347347
if flag(stylishHaskell) && impl(ghc < 9.5)
348-
build-depends: hls-stylish-haskell-plugin ^>= 1.0
348+
build-depends: hls-stylish-haskell-plugin == 2.0.0.0
349349
cpp-options: -Dhls_stylishHaskell
350350

351351
common refactor
352352
if flag(refactor)
353-
build-depends: hls-refactor-plugin ^>= 1.2
353+
build-depends: hls-refactor-plugin == 2.0.0.0
354354
cpp-options: -Dhls_refactor
355355

356356
library
@@ -405,12 +405,12 @@ library
405405
, cryptohash-sha1
406406
, data-default
407407
, ghc
408-
, ghcide ==1.10.0.0
408+
, ghcide == 2.0.0.0
409409
, githash >=0.1.6.1
410410
, lsp
411411
, hie-bios
412412
, hiedb
413-
, hls-plugin-api ^>=1.6
413+
, hls-plugin-api == 2.0.0.0
414414
, optparse-applicative
415415
, optparse-simple
416416
, process
@@ -549,7 +549,7 @@ test-suite func-test
549549
, lens-aeson
550550
, ghcide
551551
, ghcide-test-utils
552-
, hls-test-utils ^>=1.6
552+
, hls-test-utils == 2.0.0.0
553553
, lsp-types
554554
, aeson
555555
, hls-plugin-api

‎hls-graph/hls-graph.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-graph
3-
version: 1.9.0.0
3+
version: 2.0.0.0
44
synopsis: Haskell Language Server internal graph API
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server/tree/master/hls-graph#readme>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-plugin-api
3-
version: 1.6.0.0
3+
version: 2.0.0.0
44
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>
@@ -55,7 +55,7 @@ library
5555
, filepath
5656
, ghc
5757
, hashable
58-
, hls-graph ^>= 1.9
58+
, hls-graph == 2.0.0.0
5959
, lens
6060
, lens-aeson
6161
, lsp ^>=1.6.0.0

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-test-utils
3-
version: 1.6.0.0
3+
version: 2.0.0.0
44
synopsis: Utilities used in the tests of Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -41,9 +41,9 @@ library
4141
, directory
4242
, extra
4343
, filepath
44-
, ghcide ^>= 1.10
44+
, ghcide == 2.0.0.0
4545
, hls-graph
46-
, hls-plugin-api ^>=1.6
46+
, hls-plugin-api == 2.0.0.0
4747
, lens
4848
, lsp ^>=1.6.0.0
4949
, lsp-test ^>=0.14

‎plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-alternate-number-format-plugin
3-
version: 1.3.0.1
3+
version: 2.0.0.0
44
synopsis: Provide Alternate Number Formats plugin for Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -32,10 +32,10 @@ library
3232
, base >=4.12 && < 5
3333
, containers
3434
, extra
35-
, ghcide ^>= 1.10
35+
, ghcide == 2.0.0.0
3636
, ghc-boot-th
3737
, hls-graph
38-
, hls-plugin-api ^>= 1.6
38+
, hls-plugin-api == 2.0.0.0
3939
, hie-compat
4040
, lens
4141
, lsp ^>=1.6
@@ -64,7 +64,7 @@ test-suite tests
6464
, base >=4.12 && < 5
6565
, filepath
6666
, hls-alternate-number-format-plugin
67-
, hls-test-utils ^>=1.6
67+
, hls-test-utils == 2.0.0.0
6868
, lsp
6969
, QuickCheck
7070
, regex-tdfa

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-cabal-fmt-plugin
3-
version: 0.1.0.0
3+
version: 2.0.0.0
44
synopsis: Integration with the cabal-fmt code formatter
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -33,8 +33,8 @@ library
3333
, base >=4.12 && <5
3434
, directory
3535
, filepath
36-
, ghcide ^>= 1.9 || ^>= 1.10
37-
, hls-plugin-api ^>= 1.6
36+
, ghcide == 2.0.0.0
37+
, hls-plugin-api == 2.0.0.0
3838
, lens
3939
, lsp-types
4040
, process
@@ -55,7 +55,7 @@ test-suite tests
5555
, directory
5656
, filepath
5757
, hls-cabal-fmt-plugin
58-
, hls-test-utils ^>=1.6
58+
, hls-test-utils == 2.0.0.0
5959

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

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: hls-cabal-plugin
3-
version: 0.1.0.0
3+
version: 2.0.0.0
44
synopsis: Cabal integration plugin with Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -48,10 +48,10 @@ library
4848
, deepseq
4949
, directory
5050
, extra >=1.7.4
51-
, ghcide ^>= 1.9 || ^>= 1.10
51+
, ghcide == 2.0.0.0
5252
, hashable
53-
, hls-plugin-api ^>=1.6
54-
, hls-graph ^>=1.9
53+
, hls-plugin-api == 2.0.0.0
54+
, hls-graph == 2.0.0.0
5555
, lsp ^>=1.6.0.0
5656
, lsp-types ^>=1.6.0.0
5757
, regex-tdfa ^>=1.3.1
@@ -74,7 +74,7 @@ test-suite tests
7474
, filepath
7575
, ghcide
7676
, hls-cabal-plugin
77-
, hls-test-utils ^>=1.6
77+
, hls-test-utils == 2.0.0.0
7878
, lens
7979
, lsp-types
8080
, tasty-hunit

0 commit comments

Comments
 (0)