Skip to content

Commit 08e8a72

Browse files
authored
Merge pull request #386 from haskell/mpj/prepare-release
Prepare release
2 parents 2ab4c73 + f321936 commit 08e8a72

File tree

6 files changed

+52
-13
lines changed

6 files changed

+52
-13
lines changed

CONTRIBUTING.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributing
2+
3+
## Versioning policy
4+
5+
`lsp` and `lsp-types` should typically have identical versions and be released in lockstep.
6+
This is for two reasons:
7+
1. They are morally one package, and may become one again once multiple public libraries are better supported.
8+
2. `lsp` exports many types from `lsp-types`, so in practice will need a major verison bump when `lsp-types` does anyway.
9+
10+
`lsp-test` can evolve independently.
11+
12+
## Git tags
13+
14+
The tagging scheme is `$package-$version`, e.g. `lsp-types-1.0.0`.
15+
16+
## Making a release
17+
18+
1. Bump version numbers as needed (see 'Versioning policy')
19+
2. Update changelogs (currently manual, sadly)
20+
3. Once the above is in master, create git tags following 'Git tags'
21+
4. Create package candidates for the packages, and check that they all look good.
22+
5. Finalize the package candidates.

lsp-test/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Revision history for lsp-test
22

3+
## 0.14.0.2
4+
5+
* Compatibility with new lsp-types major version.
6+
37
## 0.14.0.1 -- 2021-07-30
48

59
* Catch IO exception when sending messages to server (#317) (@berberman)

lsp-test/lsp-test.cabal

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: lsp-test
3-
version: 0.14.0.1
3+
version: 0.14.0.2
44
synopsis: Functional test framework for LSP servers.
55
description:
66
A test framework for writing tests against
@@ -81,7 +81,7 @@ test-suite tests
8181
build-depends: base >= 4.10 && < 5
8282
, hspec
8383
, lens
84-
, lsp == 1.2.*
84+
, lsp == 1.4.*
8585
, lsp-test
8686
, data-default
8787
, aeson
@@ -102,12 +102,10 @@ test-suite func-test
102102
build-depends: base
103103
, lsp-test
104104
, lsp
105-
, data-default
106105
, process
107106
, lens
108107
, unliftio
109108
, hspec
110-
, async
111109
default-language: Haskell2010
112110

113111
test-suite example

lsp-types/ChangeLog.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Revision history for lsp-types
22

3+
## 1.4.0.0
4+
5+
* Aeson 2 compatibility (#360) (@michaelpj)
6+
* Reduced dependency footprint (#383, #384) (@Bodigrim)
7+
* Use appropriate number types (#366) (@michaelpj)
8+
* Fix for #374 (#376) (@pepeiborra)
9+
* Fix virtual file name adding .hs extension (#364) (@heitor-lassarote, @jneira)
10+
* Fix the Semigroup instance for MarkupContent (#361) (@michaelpj)
11+
* Various improvements to spec conformance (@michaelpj)
12+
13+
## 1.3.0.1
14+
15+
* Rollback NFP interning (#344) (@pepeiborra)
16+
17+
## 1.3.0.0
18+
19+
* Intern NormalizedFilePaths (#340) (@pepeiborra)
20+
321
## 1.2.0.1
422

523
* Add compatibility with GHC 9.2 (#345) (@fendor)

lsp/ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Revision history for lsp
22

3+
## 1.4.0.0
4+
5+
* Fix extraneous `asdf` in `withProgress` output (#372) (@heitor-lassarote)
6+
* Use appropriate number types (#366) (@michaelpj)
7+
38
## 1.2.0.1
49

510
* Add exception instances to LspT (#315) (@pepeiborra)

lsp/lsp.cabal

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: lsp
3-
version: 1.2.0.1
3+
version: 1.4.0.0
44
synopsis: Haskell library for the Microsoft Language Server Protocol
55

66
description: An implementation of the types, and basic message server to
@@ -68,18 +68,10 @@ executable lsp-demo-reactor-server
6868

6969
build-depends: base
7070
, aeson
71-
, bytestring
72-
, containers
73-
, directory
74-
, filepath
7571
, hslogger
7672
, lens >= 4.15.2
77-
, mtl
7873
, stm
7974
, text
80-
, transformers
81-
, unordered-containers
82-
, unliftio
8375
-- the package library. Comment this out if you want repl changes to propagate
8476
, lsp
8577
if !flag(demo)

0 commit comments

Comments
 (0)