Skip to content
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

Jump to bottom

Requre aeson 2 #529

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Requre aeson 2 #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1314326
Requre aeson 2
michaelpj Nov 13, 2023
4b765c1
Merge branch 'master' into mpj/require-aeson-2
michaelpj Nov 13, 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: 4 additions & 0 deletions lsp-types/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for lsp-types

## Unreleased

- Require aeson 2

## 2.1.0.0

- Add `dynamicRegistrationSupported` to `Capabilities`.
Expand Down
6 changes: 2 additions & 4 deletions lsp-types/lsp-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ library
UndecidableInstances

build-depends:
, aeson >=1.2.2.0 && <2.3
, aeson >=2 && <2.3
, base >=4.11 && <5
, binary
, containers
Expand All @@ -92,8 +92,6 @@ library
, some
, template-haskell
, text
-- needed for aeson < 1
, unordered-containers

if flag(force-ospath)
build-depends: filepath ^>=1.4.100.0
Expand Down Expand Up @@ -528,7 +526,7 @@ library metamodel
Language.LSP.MetaModel.Types

build-depends:
, aeson >=1.2.2.0
, aeson >=2
, base >=4.11 && <5
, file-embed
, lens >=4.15.2
Expand Down
6 changes: 1 addition & 5 deletions lsp-types/src/Language/LSP/Protocol/Types/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ import Control.DeepSeq
import Control.Lens
import Data.Aeson hiding (Null)
import Data.Aeson qualified as J
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.KeyMap as KM
#else
import qualified Data.HashMap.Strict as KM
#endif
import Data.Aeson.KeyMap qualified as KM
import Data.Hashable
import Data.Int (Int32)
import Data.Mod.Word
Expand Down
2 changes: 1 addition & 1 deletion lsp/lsp.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ library

ghc-options: -Wall
build-depends:
, aeson >=1.0.0.0
, aeson >=2
, async >=2.0
, attoparsec
, base >=4.11 && <5
Expand Down
Loading