Skip to content

Commit 9bab6d1

Browse files
michaelpjmichaelpj
authored
Add bounds to all dependencies (#533)
* Add bounds to all dependencies * Fix some warnings * Uncomment those deps * Ospath issues * Fix mtl bound * Fix Diff bound * Fix ansi-terminal
1 parent 483e641 commit 9bab6d1

File tree

7 files changed

+120
-114
lines changed

7 files changed

+120
-114
lines changed

‎lsp-test/lsp-test.cabal

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -43,37 +43,38 @@ library
4343
, parser-combinators:Control.Applicative.Combinators
4444

4545
build-depends:
46-
, aeson
47-
, aeson-pretty
48-
, ansi-terminal
49-
, async >=2.0
50-
, base >=4.10 && <5
51-
, bytestring
52-
, co-log-core
53-
, conduit
54-
, conduit-parse ^>=0.2
55-
, containers >=0.5.9
56-
, data-default
57-
, Diff >=0.3
58-
, directory
59-
, exceptions
60-
, filepath
61-
, Glob >=0.9 && <0.11
62-
, lens
63-
, lens-aeson
64-
, lsp ^>=2.3
65-
, lsp-types ^>=2.1
66-
, mtl <2.4
67-
, parser-combinators >=1.2
68-
, process >=1.6
69-
, row-types
70-
, some
71-
, text
72-
, time
73-
, transformers
46+
, aeson >=2 && <2.3
47+
, aeson-pretty ^>=0.8
48+
, ansi-terminal >= 0.10 && < 1.1
49+
, async ^>=2.2
50+
, base >=4.10 && <5
51+
, bytestring >=0.10 && <0.13
52+
, co-log-core ^>=0.3
53+
, conduit ^>=1.3
54+
, conduit-parse ^>=0.2
55+
, containers ^>=0.6
56+
, data-default ^>=0.7
57+
, Diff >= 0.4 && < 0.6
58+
, directory ^>=1.3
59+
, exceptions ^>=0.10
60+
, filepath ^>=1.4
61+
, Glob >=0.9 && <0.11
62+
, lens >=5.1 && <5.3
63+
, lens-aeson ^>=1.2
64+
, lsp ^>=2.3
65+
, lsp-types ^>=2.1
66+
, mtl >= 2.2 && < 2.4
67+
, parser-combinators ^>=1.3
68+
, process ^>=1.6
69+
, row-types ^>=1.0
70+
, some ^>=1.0
71+
, text >=1 && <2.2
72+
, time >=1.10 && <1.13
73+
, transformers >=0.5 && <0.7
7474

7575
if os(windows)
7676
build-depends: Win32
77+
7778
else
7879
build-depends: unix
7980

@@ -89,37 +90,36 @@ library
8990
ghc-options: -W
9091

9192
test-suite tests
92-
type: exitcode-stdio-1.0
93-
hs-source-dirs: test
94-
main-is: Test.hs
95-
default-language: Haskell2010
93+
type: exitcode-stdio-1.0
94+
hs-source-dirs: test
95+
main-is: Test.hs
96+
default-language: Haskell2010
9697
default-extensions: ImportQualifiedPost
97-
ghc-options: -W
98-
other-modules: DummyServer
98+
ghc-options: -W
99+
other-modules: DummyServer
99100
build-depends:
100101
, aeson
101-
, base >=4.10 && <5
102+
, base >=4.10 && <5
102103
, containers
103104
, data-default
104105
, directory
105106
, filepath
106107
, hspec
107108
, lens
108-
, lsp ^>=2.3
109+
, lsp ^>=2.3
109110
, lsp-test
110-
, mtl <2.4
111+
, mtl <2.4
111112
, parser-combinators
112113
, process
113114
, text
114115
, unliftio
115116

116-
117117
test-suite func-test
118-
type: exitcode-stdio-1.0
119-
hs-source-dirs: func-test
120-
default-language: Haskell2010
118+
type: exitcode-stdio-1.0
119+
hs-source-dirs: func-test
120+
default-language: Haskell2010
121121
default-extensions: ImportQualifiedPost
122-
main-is: FuncTest.hs
122+
main-is: FuncTest.hs
123123
build-depends:
124124
, base
125125
, co-log-core
@@ -131,7 +131,6 @@ test-suite func-test
131131
, process
132132
, unliftio
133133

134-
135134
test-suite example
136135
type: exitcode-stdio-1.0
137136
hs-source-dirs: example
@@ -142,19 +141,19 @@ test-suite example
142141
, base
143142
, lsp-test
144143
, parser-combinators
144+
145145
build-tool-depends: lsp:lsp-demo-reactor-server
146146

147147
benchmark simple-bench
148-
type: exitcode-stdio-1.0
149-
hs-source-dirs: bench
150-
default-language: Haskell2010
148+
type: exitcode-stdio-1.0
149+
hs-source-dirs: bench
150+
default-language: Haskell2010
151151
default-extensions: ImportQualifiedPost
152-
main-is: SimpleBench.hs
153-
ghc-options: -Wall -O2 -eventlog -rtsopts
152+
main-is: SimpleBench.hs
153+
ghc-options: -Wall -O2 -eventlog -rtsopts
154154
build-depends:
155155
, base
156156
, extra
157157
, lsp
158158
, lsp-test
159159
, process
160-

‎lsp-types/lsp-types.cabal

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ category: Development
1818
build-type: Simple
1919
extra-source-files:
2020
ChangeLog.md
21-
README.md
2221
metaModel.json
22+
README.md
2323

2424
source-repository head
2525
type: git
@@ -34,6 +34,7 @@ flag force-ospath
3434
library
3535
hs-source-dirs: src generated
3636
default-language: Haskell2010
37+
3738
-- Various things we want on by default
3839
-- * syntactic niceties, QOL
3940
-- * we always want more deriving options
@@ -69,32 +70,33 @@ library
6970
UndecidableInstances
7071

7172
build-depends:
72-
, aeson >=2 && <2.3
73-
, base >=4.11 && <5
74-
, binary
75-
, containers
76-
, data-default
77-
, deepseq
78-
, Diff >=0.2
79-
, dlist
80-
, exceptions
81-
, hashable >=1.3.4.0
82-
, indexed-traversable
83-
, indexed-traversable-instances
84-
, lens >=4.15.2
85-
, lens-aeson
86-
, mod
87-
, mtl <2.4
88-
, prettyprinter
89-
, network-uri >=2.6
90-
, row-types >=1.0
91-
, safe
92-
, some
93-
, template-haskell
94-
, text
73+
, aeson >=2 && <2.3
74+
, base >=4.11 && <5
75+
, binary ^>=0.8
76+
, containers ^>=0.6
77+
, data-default ^>=0.7
78+
, deepseq >=1.4 && <1.6
79+
, Diff >= 0.4 && < 0.6
80+
, dlist ^>=1.0
81+
, exceptions ^>=0.10
82+
, hashable ^>=1.4
83+
, indexed-traversable ^>=0.1
84+
, indexed-traversable-instances ^>=0.1
85+
, lens >=5.1 && <5.3
86+
, lens-aeson ^>=1.2
87+
, mod ^>=0.2
88+
, mtl >= 2.2 && < 2.4
89+
, network-uri ^>=2.6
90+
, prettyprinter ^>=1.7
91+
, row-types ^>=1.0
92+
, safe ^>=0.3
93+
, some ^>=1.0
94+
, template-haskell >=2.7 && <2.22
95+
, text >=1 && <2.2
9596

9697
if flag(force-ospath)
9798
build-depends: filepath ^>=1.4.100.0
99+
98100
else
99101
build-depends: filepath
100102

@@ -107,9 +109,9 @@ library
107109
Data.Row.Aeson
108110
Data.Row.Hashable
109111
Language.LSP.Protocol.Capabilities
112+
Language.LSP.Protocol.Lens
110113
Language.LSP.Protocol.Message
111114
Language.LSP.Protocol.Types
112-
Language.LSP.Protocol.Lens
113115
Language.LSP.Protocol.Utils.Misc
114116
Language.LSP.Protocol.Utils.SMethodMap
115117

@@ -517,17 +519,20 @@ library
517519
library metamodel
518520
-- We don't currently re-export this from the main
519521
-- library, but it's here if people want it
520-
visibility: public
522+
visibility: public
521523
hs-source-dirs: metamodel
522524
default-language: Haskell2010
523-
default-extensions: StrictData ImportQualifiedPost
525+
default-extensions:
526+
ImportQualifiedPost
527+
StrictData
528+
524529
exposed-modules:
525530
Language.LSP.MetaModel
526531
Language.LSP.MetaModel.Types
527532

528533
build-depends:
529534
, aeson >=2
530-
, base >=4.11 && <5
535+
, base >=4.11 && <5
531536
, file-embed
532537
, lens >=4.15.2
533538
, template-haskell
@@ -536,7 +541,10 @@ library metamodel
536541
executable generator
537542
hs-source-dirs: generator
538543
default-language: Haskell2010
539-
default-extensions: StrictData ImportQualifiedPost
544+
default-extensions:
545+
ImportQualifiedPost
546+
StrictData
547+
540548
main-is: Main.hs
541549
other-modules: CodeGen
542550
build-depends:
@@ -569,7 +577,6 @@ test-suite lsp-types-test
569577
WorkspaceEditSpec
570578

571579
ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
572-
573580
build-depends:
574581
, aeson >=2.0.3.0
575582
, base

‎lsp-types/src/Language/LSP/Protocol/Message/Types.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import Language.LSP.Protocol.Message.LspId
1212
import Language.LSP.Protocol.Message.Meta
1313
import Language.LSP.Protocol.Message.Method ()
1414
import Language.LSP.Protocol.Types
15-
import Language.LSP.Protocol.Types.Common
1615
import Language.LSP.Protocol.Utils.Misc
1716

1817
import Data.Aeson hiding (Null)

‎lsp-types/test/URIFilePathSpec.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ module URIFilePathSpec where
1414

1515
#ifdef OS_PATH
1616
import qualified System.OsPath as OsPath
17+
import Control.Exception (throwIO)
18+
import Data.Maybe (fromJust)
1719
#endif
1820

19-
import Control.Exception (throwIO)
2021
import Control.Monad (when)
2122
import Data.List
22-
import Data.Maybe (fromJust)
2323
import Data.Text (Text, pack)
2424
import Language.LSP.Protocol.Types
2525

‎lsp/example/Reactor.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
{-# LANGUAGE RankNTypes #-}
88
{-# LANGUAGE ScopedTypeVariables #-}
99
{-# LANGUAGE TypeInType #-}
10+
{-# LANGUAGE TypeOperators #-}
1011
-- So we can keep using the old prettyprinter modules (which have a better
1112
-- compatibility range) for now.
1213
{-# OPTIONS_GHC -Wno-deprecations #-}

0 commit comments

Comments
 (0)